diff --git a/etc/jacks-context.json b/etc/jacks-context.json
index 472b7353..84989942 100644
--- a/etc/jacks-context.json
+++ b/etc/jacks-context.json
@@ -209,10 +209,6 @@
         "id": "urn:publicid:IDN+instageni.umkc.edu+authority+cm",
         "name": "instageni.umkc.edu"
       },
-      {
-        "id": "urn:publicid:IDN+utah.geniracks.net+authority+cm",
-        "name": "utah.geniracks.net"
-      },
       {
         "id": "urn:publicid:IDN+utahddc.geniracks.net+authority+cm",
         "name": "utahddc.geniracks.net"
@@ -297,6 +293,10 @@
         "id": "x86_64-vm",
         "name": "x86_64-vm"
       },
+      {
+        "id": "aarch64",
+        "name": "aarch64"
+      },
       {
         "id": "m510",
         "name": "m510"
@@ -305,10 +305,6 @@
         "id": "m510-vm",
         "name": "m510-vm"
       },
-      {
-        "id": "aarch64",
-        "name": "aarch64"
-      },
       {
         "id": "dboxvm-vm",
         "name": "dboxvm-vm"
@@ -330,48 +326,36 @@
         "name": "bridge-dl360"
       },
       {
-        "id": "bridge-pc3300",
-        "name": "bridge-pc3300"
-      },
-      {
-        "id": "pc3300-vm",
-        "name": "pc3300-vm"
-      },
-      {
-        "id": "delay-pc3300",
-        "name": "delay-pc3300"
-      },
-      {
-        "id": "pcvm3300",
-        "name": "pcvm3300"
+        "id": "",
+        "name": ""
       },
       {
-        "id": "pc3300",
-        "name": "pc3300"
+        "id": "-vm",
+        "name": "-vm"
       },
       {
         "id": "bridge-pc2400",
         "name": "bridge-pc2400"
       },
       {
-        "id": "delay-pc3400",
-        "name": "delay-pc3400"
+        "id": "pc3300-vm",
+        "name": "pc3300-vm"
       },
       {
-        "id": "pc3400-vm",
-        "name": "pc3400-vm"
+        "id": "delay-pc3300",
+        "name": "delay-pc3300"
       },
       {
-        "id": "pc3400",
-        "name": "pc3400"
+        "id": "bridge-pc3300",
+        "name": "bridge-pc3300"
       },
       {
-        "id": "pcvm3400",
-        "name": "pcvm3400"
+        "id": "pcvm3300",
+        "name": "pcvm3300"
       },
       {
-        "id": "bridge-pc3400",
-        "name": "bridge-pc3400"
+        "id": "pc3300",
+        "name": "pc3300"
       },
       {
         "id": "bridge-pc3000",
@@ -398,13 +382,33 @@
         "name": "bridge-pc3500"
       },
       {
-        "id": "delay-d430",
-        "name": "delay-d430"
+        "id": "pcvm3400",
+        "name": "pcvm3400"
+      },
+      {
+        "id": "delay-pc3400",
+        "name": "delay-pc3400"
+      },
+      {
+        "id": "pc3400-vm",
+        "name": "pc3400-vm"
+      },
+      {
+        "id": "pc3400",
+        "name": "pc3400"
+      },
+      {
+        "id": "bridge-pc3400",
+        "name": "bridge-pc3400"
       },
       {
         "id": "firewall",
         "name": "firewall"
       },
+      {
+        "id": "delay-d430",
+        "name": "delay-d430"
+      },
       {
         "id": "bridge-d430",
         "name": "bridge-d430"
@@ -441,14 +445,6 @@
         "id": "nexus5",
         "name": "nexus5"
       },
-      {
-        "id": "pc2400c2",
-        "name": "pc2400c2"
-      },
-      {
-        "id": "",
-        "name": ""
-      },
       {
         "id": "bridge-d430k",
         "name": "bridge-d430k"
@@ -461,14 +457,14 @@
         "id": "delay-d430k",
         "name": "delay-d430k"
       },
-      {
-        "id": "-vm",
-        "name": "-vm"
-      },
       {
         "id": "d430k-vm",
         "name": "d430k-vm"
       },
+      {
+        "id": "pc2400c2",
+        "name": "pc2400c2"
+      },
       {
         "id": "d530-vm",
         "name": "d530-vm"
@@ -772,6 +768,16 @@
         "name": "Centos 6.8 v1.1.0",
         "version": "88e40764a31b2ddc8410302c81cf3916f6c140b5"
       },
+      {
+        "id": "http://geni-images.renci.org/images/standard/centos/centos6.9-v1.0.0/centos6.9-v1.0.0.xml",
+        "name": "Centos 6.9 v1.0.0",
+        "version": "7cc4cddfd0ebfe7f02e006771c4cf2daddbd87e7"
+      },
+      {
+        "id": "http://geni-images.renci.org/images/standard/centos/centos7.3-v1.0.2/centos7.3-v1.0.2.xml",
+        "name": "Centos 7.3 v1.0.2",
+        "version": "a975e8ba8ace7358c5589f379675ce89c8830053"
+      },
       {
         "id": "http://geni-images.renci.org/images/standard/debian/deb6.v1.0.10.xml",
         "name": "Debian 6 (squeeze) v1.0.10",
@@ -888,33 +894,29 @@
         "name": "FreeBSD 9.2 32-bit version"
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD",
-        "name": "Ubuntu 16.04 LTS 64 bit"
-      },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS",
-        "name": "Ubuntu 12.04 with OVS for ProtoGeni (by Niky)",
-        "nomac": true
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218",
+        "name": "GeniDesktop Ubuntu 14.04 64 bit for Instageni Xen Nodes"
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD",
-        "name": "Standard 32-bit Fedora 15 image"
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD",
+        "name": "Ubuntu 16.04 LTS 64 bit"
       },
       {
         "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD",
         "name": "Emulab Standard CentOS 6.3 64-bit image."
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FC15-INSTOOLS-GUEST",
-        "name": "Guest for FC15 INSTOOLS"
+        "id": "urn:publicid:IDN+emulab.net+image+ch-geni-net:GDXEN160218",
+        "name": "Ubuntu 14.04 LTS"
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FC15-INSTOOLS-NODE",
-        "name": "Guest VM for INSTOOLS nodes"
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD",
+        "name": "Standard 32-bit Fedora 15 image"
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:XEN45-64-FAUX",
-        "name": "Incomplete copy of Xen 4.5 (no Emulab vnode setup)"
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS",
+        "name": "Ubuntu 12.04 with OVS for ProtoGeni (by Niky)",
+        "nomac": true
       },
       {
         "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:myalias",
@@ -932,89 +934,53 @@
         "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSNM",
         "name": "UBUNTU16-64-STD with OpenStack Liberty NetworkManager Packages"
       },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD72-STD",
-        "name": "FreeBSD 7.2"
-      },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS55-STD",
-        "name": "Emulab standard CentOS 5.5 32-bit image."
-      },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS55-64-STD",
-        "name": "Emulab standard CentOS 5.5 64-bit image. "
-      },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU10-STD",
-        "name": "Ubuntu 10 32-bit"
-      },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU10-UPD",
-        "name": "Ubuntu 10.04.1 32-bit (Lucid Lynx)"
-      },
       {
         "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-64-STD",
         "name": "Standard 64-bit Fedora 15 image"
       },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU10-64-KRG",
-        "name": "ubuntu krg exported for ProtoGeni"
-      },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA8-64-OVZ-UPD",
-        "name": "Update to FEDORA8-64-OVZ-STD"
-      },
       {
         "id": "urn:publicid:IDN+emulab.net+image+testbed:UBUNTU12-64-KVM",
         "name": "Ubuntu 12.04 LTS with KVM installed"
       },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:XEN41-64-STD",
-        "name": "Xen 4.1 with 64-bit Ubuntu 12 dom0"
-      },
-      {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA10-UPD",
-        "name": "Standard 32 bit Fedora10"
-      },
       {
         "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV-NOVLANS",
         "name": "Dummy OS descriptor for blackbox devices without support for 802.1q"
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+PhantomNet:ANDROID444-STD",
-        "name": "Android KitKat 4.4.4"
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD102-64-SUBBOSS",
+        "name": "Emulab subboss running FBSD 10.2"
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:NETFPGA",
-        "name": "Dummy OS for NetFPGAs."
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:BBGENI-FAKE",
+        "name": "A Fake OSID for the Fake BBGeni nodes"
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:PROCURVE-15-17-STD",
-        "name": "HP ProCurve K.15.17.0007 firmware (openflow 1.3)."
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:NETFPGA",
+        "name": "Dummy OS for NetFPGAs."
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV",
-        "name": "A fake OSID for a fake node representing a device"
+        "id": "urn:publicid:IDN+emulab.net+image+PhantomNet:ANDROID444-STD",
+        "name": "Android KitKat 4.4.4"
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD102-64-SUBBOSS",
-        "name": "Emulab subboss running FBSD 10.2"
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:PROCURVE-15-17-STD",
+        "name": "HP ProCurve K.15.17.0007 firmware (openflow 1.3)."
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD83-64-DBOX",
-        "name": "FreeBSD 8.3 64-bit version with mbuf sizing for 10Gb enet"
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:EMOTE-SSERVER",
+        "name": "Dummy OS for the e-mote serial line server"
       },
       {
         "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:POWERMON",
         "name": "Dummy OS for power monitor devices."
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:EMOTE-SSERVER",
-        "name": "Dummy OS for the e-mote serial line server"
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV",
+        "name": "A fake OSID for a fake node representing a device"
       },
       {
-        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:BBGENI-FAKE",
-        "name": "A Fake OSID for the Fake BBGeni nodes"
+        "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD83-64-DBOX",
+        "name": "FreeBSD 8.3 64-bit version with mbuf sizing for 10Gb enet"
       },
       {
         "id": "urn:publicid:IDN+emulab.net+image+emulab-ops:DEB77-64-STD",
@@ -1248,9 +1214,9 @@
           "firewall",
           "gec16-port",
           "xcvr2450",
-          "motehost",
           "delay-d710",
-          "delay-d430k",
+          "emote",
+          "pc2gen",
           "d430k",
           "pcvm2830qx2",
           "pcivy-vm",
@@ -1261,11 +1227,12 @@
           "d430",
           "pcvron",
           "wire",
-          "pcvm",
+          "interconnect",
           "80211g",
           "bbgeni-vm",
           "pcsanhost",
           "nuc5300",
+          "nexus5",
           "switch",
           "gec16port",
           "netfpga2",
@@ -1273,7 +1240,6 @@
           "pc",
           "pcpg-i2",
           "ipv4",
-          "pcvroninet",
           "pc2830qx2-vm",
           "pcvmivy",
           "bridge-pc3000",
@@ -1282,25 +1248,24 @@
           "netfpga",
           "80211b",
           "lan",
-          "d2100-vm",
+          "hp5406",
           "pcpg-i2-vm",
           "d710-vm",
           "pcvwa",
-          "hp5406",
+          "d2100-vm",
           "bridge-d430k",
-          "pc2gen",
           "pcivy",
-          "emote",
+          "delay-d430k",
           "pm-mote",
-          "pcvmpg",
+          "ue",
           "80211a",
           "d710",
           "flex900",
-          "interconnect-vm",
+          "motehost",
           "pcpg",
-          "interconnect",
+          "pcvm",
           "d530",
-          "ue",
+          "pcvroninet",
           "spp-vm",
           "d430-vm",
           "d530-vm",
@@ -1308,6 +1273,7 @@
           "bridge-d710",
           "pc2400hp",
           "d2100",
+          "pcvmpg",
           "bbgeni",
           "enodeb",
           "sppvm",
@@ -1315,11 +1281,11 @@
           "powermon",
           "bbg",
           "bridge-d430",
-          "bbgenivm",
+          "interconnect-vm",
           "spp",
           "d820-vm",
           "pc3000",
-          "nexus5",
+          "bbgenivm",
           "pcpg-vm",
           "d430k-vm"
         ],
@@ -1341,18 +1307,18 @@
           "orca-iscsi-luns"
         ],
         "types": [
-          "EC2M1Small",
+          "XOSmall",
           "EC2C1Medium",
-          "EucaM1Large",
+          "EC2M1XLarge",
           "EucaC1XLarge",
           "XOLarge",
-          "EC2M1XLarge",
           "EucaM1Small",
-          "XOSmall",
+          "EC2M1Small",
           "EucaC1Medium",
+          "EucaM1XLarge",
           "XOMedium",
           "EC2M1Large",
-          "EucaM1XLarge",
+          "EucaM1Large",
           "XOXlarge"
         ]
       },
@@ -1368,19 +1334,19 @@
           "orca-iscsi-luns"
         ],
         "types": [
-          "EC2M1Small",
+          "XOSmall",
           "EC2C1Medium",
-          "EC2M1XLarge",
+          "EucaM1Large",
           "EucaC1XLarge",
           "XOLarge",
           "EucaM1Small",
-          "XOSmall",
           "EucaC1Medium",
+          "XOXlarge",
           "EucaM1XLarge",
           "XOMedium",
           "EC2M1Large",
-          "EucaM1Large",
-          "XOXlarge"
+          "EC2M1XLarge",
+          "EC2M1Small"
         ]
       },
       "urn:publicid:IDN+exogeni.net:nictaNet+authority+am": {
@@ -1396,16 +1362,16 @@
         "types": [
           "XOSmall",
           "EC2C1Medium",
-          "EC2M1XLarge",
+          "EucaM1Large",
           "EucaC1XLarge",
           "XOLarge",
           "EucaM1Small",
-          "EucaC1Medium",
           "EC2M1Small",
+          "EucaC1Medium",
           "EucaM1XLarge",
           "XOMedium",
           "EC2M1Large",
-          "EucaM1Large",
+          "EC2M1XLarge",
           "XOXlarge"
         ]
       },
@@ -1423,17 +1389,17 @@
         "types": [
           "XOSmall",
           "EC2C1Medium",
-          "EC2M1XLarge",
+          "EucaM1Large",
           "EucaC1XLarge",
           "XOLarge",
           "EucaM1Small",
           "EucaC1Medium",
-          "XOXlarge",
+          "EC2M1Small",
           "EucaM1XLarge",
           "XOMedium",
           "EC2M1Large",
-          "EucaM1Large",
-          "EC2M1Small"
+          "EC2M1XLarge",
+          "XOXlarge"
         ]
       },
       "urn:publicid:IDN+exogeni.net:rciNet+authority+am": {
@@ -1448,18 +1414,18 @@
           "orca-iscsi-luns"
         ],
         "types": [
-          "EC2M1Small",
+          "XOSmall",
           "EC2C1Medium",
           "EC2M1XLarge",
           "EucaC1XLarge",
-          "EucaM1Large",
           "XOLarge",
           "EucaM1Small",
-          "XOSmall",
+          "EC2M1Small",
           "EucaC1Medium",
+          "EucaM1XLarge",
           "XOMedium",
           "EC2M1Large",
-          "EucaM1XLarge",
+          "EucaM1Large",
           "XOXlarge"
         ]
       },
@@ -1475,18 +1441,18 @@
           "orca-iscsi-luns"
         ],
         "types": [
-          "XOSmall",
+          "XOLarge",
           "EC2C1Medium",
-          "EC2M1XLarge",
+          "EucaM1Large",
           "EucaC1XLarge",
           "XOMedium",
-          "XOLarge",
+          "EucaM1XLarge",
           "EucaM1Small",
+          "XOSmall",
           "EucaC1Medium",
-          "EucaM1XLarge",
           "EC2M1Small",
           "EC2M1Large",
-          "EucaM1Large",
+          "EC2M1XLarge",
           "XOXlarge"
         ]
       },
@@ -1507,13 +1473,13 @@
           "EucaM1Large",
           "EucaC1XLarge",
           "XOLarge",
+          "EC2M1XLarge",
           "EucaM1Small",
           "EC2M1Small",
           "EucaC1Medium",
-          "EucaM1XLarge",
           "XOMedium",
           "EC2M1Large",
-          "EC2M1XLarge",
+          "EucaM1XLarge",
           "XOXlarge"
         ]
       },
@@ -1529,18 +1495,18 @@
           "orca-iscsi-luns"
         ],
         "types": [
-          "EC2M1Small",
+          "XOSmall",
           "EC2C1Medium",
+          "EucaM1Large",
           "EC2M1XLarge",
           "EucaC1XLarge",
+          "XOMedium",
           "XOLarge",
           "EucaM1Small",
-          "XOSmall",
           "EucaC1Medium",
-          "EucaM1XLarge",
-          "XOMedium",
+          "EC2M1Small",
           "EC2M1Large",
-          "EucaM1Large",
+          "EucaM1XLarge",
           "XOXlarge"
         ]
       },
@@ -1556,14 +1522,14 @@
           "orca-iscsi-luns"
         ],
         "types": [
-          "EC2M1Small",
+          "XOSmall",
           "EC2C1Medium",
           "EC2M1XLarge",
           "EucaC1XLarge",
           "EucaM1Large",
           "XOLarge",
           "EucaM1Small",
-          "XOSmall",
+          "EC2M1Small",
           "EucaC1Medium",
           "XOMedium",
           "EC2M1Large",
@@ -1583,13 +1549,13 @@
           "orca-iscsi-luns"
         ],
         "types": [
-          "XOSmall",
+          "EC2M1Small",
           "EC2C1Medium",
           "EucaM1Large",
           "EucaC1XLarge",
           "XOLarge",
           "EucaM1Small",
-          "EC2M1Small",
+          "XOSmall",
           "EucaC1Medium",
           "EucaM1XLarge",
           "XOMedium",
@@ -1609,18 +1575,18 @@
           "orca-vm-cloud"
         ],
         "types": [
-          "XOSmall",
+          "EC2M1Small",
           "EC2C1Medium",
-          "EucaM1Large",
+          "EC2M1XLarge",
           "EucaC1XLarge",
           "XOLarge",
           "EucaM1Small",
-          "EC2M1Small",
+          "XOSmall",
           "EucaC1Medium",
           "EucaM1XLarge",
           "XOMedium",
           "EC2M1Large",
-          "EC2M1XLarge",
+          "EucaM1Large",
           "XOXlarge"
         ]
       },
@@ -2272,6 +2238,7 @@
       },
       "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm": {
         "hardware": [
+          "",
           "bridge",
           "lan",
           "interconnect",
@@ -2284,6 +2251,7 @@
           "bridge-dl360",
           "delay-dl360",
           "interconnect-vm",
+          "-vm",
           "pcvm"
         ],
         "types": [
@@ -2294,6 +2262,7 @@
       },
       "urn:publicid:IDN+uky.emulab.net+authority+cm": {
         "hardware": [
+          "",
           "bridge",
           "delay-pc2400",
           "pcvm3500",
@@ -2311,20 +2280,21 @@
           "pcvm3000",
           "pc2400",
           "pc3400",
-          "pc3000-vm",
+          "-vm",
           "lan",
           "pc3300-vm",
-          "pc3000",
+          "delay-pc3400",
           "interconnect",
           "pcvm2400",
           "bridge-pc3300",
           "bridge-pc3000",
           "pc3500-vm",
+          "pc3000-vm",
           "delay-pc3500",
           "switch",
           "pc3300",
           "bridge-pc3500",
-          "delay-pc3400",
+          "pc3000",
           "interconnect-vm",
           "pcvm3400",
           "bridge-pc3400"
@@ -2360,30 +2330,6 @@
           "raw-pc"
         ]
       },
-      "urn:publicid:IDN+utah.geniracks.net+authority+cm": {
-        "hardware": [
-          "x86_64",
-          "lan",
-          "pcvm",
-          "bridge",
-          "interconnect",
-          "dl360-vm",
-          "delay",
-          "pc",
-          "switch",
-          "ipv4",
-          "interconnect-vm",
-          "delay-dl360",
-          "bridge-dl360",
-          "dl360",
-          "x86_64-vm"
-        ],
-        "types": [
-          "emulab-openvz",
-          "emulab-xen",
-          "raw-pc"
-        ]
-      },
       "urn:publicid:IDN+utahddc.geniracks.net+authority+cm": {
         "hardware": [
           "bridge",
@@ -2608,10 +2554,6 @@
         "id": "raw-pc",
         "name": "raw-pc"
       },
-      {
-        "id": "XOLarge",
-        "name": "XOLarge"
-      },
       {
         "id": "XOSmall",
         "name": "XOSmall"
@@ -2620,6 +2562,10 @@
         "id": "XOMedium",
         "name": "XOMedium"
       },
+      {
+        "id": "XOLarge",
+        "name": "XOLarge"
+      },
       {
         "id": "XOXlarge",
         "name": "XOXlarge"
@@ -2656,7 +2602,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOSmall"
         ]
       }
     },
@@ -2669,7 +2615,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOLarge"
         ]
       }
     },
@@ -2682,7 +2628,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOMedium"
         ]
       }
     },
@@ -2695,7 +2641,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOXlarge"
         ]
       }
     },
@@ -2861,7 +2807,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FC15-INSTOOLS-GUEST"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-openvz"
@@ -2874,10 +2820,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "!"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
@@ -2887,10 +2833,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FC15-INSTOOLS-NODE"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
@@ -2900,7 +2846,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSNM"
         ],
         "types": [
           "emulab-xen"
@@ -2913,7 +2859,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:myalias"
         ],
         "types": [
           "emulab-xen"
@@ -2926,7 +2872,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FC15-INSTOOLS-GUEST"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -2939,7 +2885,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSNM"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -2952,7 +2898,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:myalias"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSCN"
         ],
         "types": [
           "emulab-xen"
@@ -2965,7 +2911,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:XEN45-64-FAUX"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-xen"
@@ -2978,7 +2924,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSCP"
         ],
         "types": [
           "emulab-xen"
@@ -2991,10 +2937,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
@@ -3004,10 +2950,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FC15-INSTOOLS-NODE"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSCN"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
@@ -3017,10 +2963,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSCN"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD102-64-SUBBOSS"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
@@ -3030,10 +2976,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:NETFPGA"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
@@ -3043,10 +2989,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSCP"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSNM"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
@@ -3056,7 +3002,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSCN"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -3069,7 +3015,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD102-64-SUBBOSS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:myalias"
         ],
         "types": [
           "raw-pc"
@@ -3082,7 +3028,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV-NOVLANS"
         ],
         "types": [
           "raw-pc"
@@ -3095,7 +3041,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD72-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:PROCURVE-15-17-STD"
         ],
         "types": [
           "raw-pc"
@@ -3108,7 +3054,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:myalias"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -3121,7 +3067,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -3147,7 +3093,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU10-64-KRG"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:POWERMON"
         ],
         "types": [
           "raw-pc"
@@ -3160,7 +3106,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:EMOTE-SSERVER"
+          "urn:publicid:IDN+emulab.net+image+PhantomNet:ANDROID444-STD"
         ],
         "types": [
           "raw-pc"
@@ -3173,7 +3119,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSCP"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD83-64-DBOX"
         ],
         "types": [
           "raw-pc"
@@ -3186,7 +3132,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -3199,7 +3145,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:POWERMON"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:EMOTE-SSERVER"
         ],
         "types": [
           "raw-pc"
@@ -3212,7 +3158,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSNM"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV"
         ],
         "types": [
           "raw-pc"
@@ -3225,7 +3171,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU10-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:BBGENI-FAKE"
         ],
         "types": [
           "raw-pc"
@@ -3238,7 +3184,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:PROCURVE-15-17-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -3251,7 +3197,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-OSCP"
         ],
         "types": [
           "raw-pc"
@@ -3261,192 +3207,192 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS55-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOMedium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS55-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOSmall"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:XEN41-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOXlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOLarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV-NOVLANS"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD83-64-DBOX"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU10-UPD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:XEN45-64-FAUX"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA8-64-OVZ-UPD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:BBGENI-FAKE"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:NETFPGA"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+PhantomNet:ANDROID444-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA10-UPD"
+          "!"
         ],
         "types": [
           "raw-pc"
@@ -3456,10 +3402,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -3469,52 +3415,52 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "XOMedium"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "XOSmall"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "XOXlarge"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am"
+          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "XOLarge"
+          "raw-pc"
         ]
       }
     },
@@ -3524,20 +3470,20 @@
           "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "!"
         ],
         "types": [
           "emulab-openvz"
@@ -3547,23 +3493,23 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "!"
         ],
         "types": [
           "emulab-xen"
@@ -3573,10 +3519,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -3586,10 +3532,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -3599,10 +3545,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -3612,7 +3558,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
@@ -3625,7 +3571,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -3638,7 +3584,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -3651,7 +3597,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -3664,20 +3610,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -3690,23 +3623,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -3716,10 +3636,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -3729,10 +3649,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -3742,7 +3662,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
@@ -3755,7 +3675,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -3768,7 +3688,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
+          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -3781,33 +3701,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.maxgigapop.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "!"
@@ -3820,7 +3714,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -3833,7 +3727,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "!"
@@ -3846,7 +3740,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
@@ -3859,7 +3753,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
@@ -3872,7 +3766,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
@@ -3885,7 +3779,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
@@ -3898,10 +3792,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS71-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -3911,7 +3805,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -3924,20 +3818,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -3950,7 +3831,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "!"
@@ -3963,7 +3844,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
@@ -3976,10 +3857,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -3989,10 +3870,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -4002,10 +3883,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS71-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -4015,10 +3896,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+apt.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -4028,88 +3909,88 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOSmall"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.uchicago.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOLarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
         ],
         "images": [
           "!"
         ],
         "types": [
-          "emulab-openvz"
+          "XOMedium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "!"
         ],
         "types": [
-          "emulab-openvz"
+          "XOXlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
           "!"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "!"
         ],
         "types": [
           "emulab-xen"
@@ -4119,7 +4000,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
@@ -4132,10 +4013,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -4145,10 +4026,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS71-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -4158,10 +4039,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -4171,7 +4052,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -4184,7 +4065,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -4197,10 +4078,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -4210,10 +4091,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -4223,10 +4104,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -4236,10 +4117,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS71-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -4249,101 +4130,101 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+apt.emulab.net+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "XOMedium"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
           "!"
         ],
         "types": [
-          "XOSmall"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "XOXlarge"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "XOLarge"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -4353,72 +4234,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -4431,7 +4247,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -4444,10 +4260,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -4457,10 +4273,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -4470,10 +4286,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -4483,7 +4299,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -4496,7 +4312,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.research.umich.edu+authority+cm"
+          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -4509,7 +4325,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -4522,7 +4338,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -4535,7 +4351,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -4548,10 +4364,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -4561,10 +4377,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -4574,10 +4390,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -4587,10 +4403,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "emulab-xen"
@@ -4600,7 +4416,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -4613,7 +4429,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -4626,7 +4442,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -4639,7 +4455,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -4652,10 +4468,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -4665,10 +4481,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -4678,10 +4494,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -4691,10 +4507,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -4704,10 +4520,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -4717,10 +4533,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.washington.edu+authority+cm"
+          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -4733,20 +4549,20 @@
           "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "!"
         ],
         "types": [
           "emulab-openvz"
@@ -4756,23 +4572,23 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "!"
         ],
         "types": [
           "emulab-xen"
@@ -4782,10 +4598,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -4795,10 +4611,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -4808,10 +4624,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -4821,7 +4637,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
@@ -4834,7 +4650,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -4847,7 +4663,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -4860,7 +4676,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -4873,7 +4689,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -4886,10 +4702,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -4899,7 +4715,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
@@ -4912,36 +4728,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -4951,7 +4741,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
@@ -4964,7 +4754,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -4977,7 +4767,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.umkc.edu+authority+cm"
+          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -4990,7 +4780,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -5003,7 +4793,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -5016,7 +4806,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -5029,10 +4819,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -5042,10 +4832,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -5055,10 +4845,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -5068,10 +4858,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -5081,7 +4871,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
@@ -5094,7 +4884,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -5107,7 +4897,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -5120,7 +4910,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -5133,23 +4923,23 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -5159,23 +4949,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -5185,10 +4962,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -5198,10 +4975,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -5211,7 +4988,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
@@ -5224,7 +5001,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -5237,7 +5014,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -5250,33 +5027,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+lan.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -5289,7 +5040,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -5302,7 +5053,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -5315,23 +5066,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+ch-geni-net:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -5341,10 +5079,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -5354,10 +5092,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -5367,10 +5105,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -5380,7 +5118,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
@@ -5393,7 +5131,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -5406,7 +5144,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -5419,7 +5157,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -5432,23 +5170,23 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+ch-geni-net:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -5458,10 +5196,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -5471,7 +5209,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
@@ -5484,10 +5222,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -5497,10 +5235,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -5510,10 +5248,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -5523,10 +5261,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -5536,59 +5274,59 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOMedium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOSmall"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOXlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOLarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
           "!"
@@ -5601,7 +5339,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -5614,7 +5352,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
           "!"
@@ -5627,23 +5365,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -5653,7 +5378,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
@@ -5666,10 +5391,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -5679,7 +5404,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
@@ -5692,7 +5417,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -5705,7 +5430,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -5718,7 +5443,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -5731,7 +5456,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
           "!"
@@ -5744,10 +5469,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -5757,10 +5482,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -5770,10 +5495,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -5783,10 +5508,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -5796,10 +5521,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -5809,10 +5534,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -5822,101 +5547,101 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "XOMedium"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
           "!"
         ],
         "types": [
-          "XOSmall"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "XOXlarge"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "XOLarge"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -5926,10 +5651,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-xen"
@@ -5939,270 +5664,270 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:nictavmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "XOMedium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:nictavmsite+authority+am"
         ],
         "images": [
           "!"
         ],
         "types": [
-          "raw-pc"
+          "XOSmall"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:nictavmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS63-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOXlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+exogeni.net:nictavmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOLarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.ku.gpeni.net+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-xen"
@@ -6212,231 +5937,231 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+geni.kettering.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
           "raw-pc"
@@ -6446,114 +6171,114 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:nictavmsite+authority+am"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "XOMedium"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:nictavmsite+authority+am"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "XOSmall"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:nictavmsite+authority+am"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "XOXlarge"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:nictavmsite+authority+am"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "XOLarge"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
           "!"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "!"
         ],
         "types": [
           "emulab-xen"
@@ -6563,10 +6288,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:DEB77-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -6576,7 +6301,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
@@ -6589,10 +6314,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS65-64-STD-BIG2"
         ],
         "types": [
           "emulab-xen"
@@ -6602,7 +6327,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -6615,7 +6340,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -6628,7 +6353,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -6641,20 +6366,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
           "!"
@@ -6667,36 +6379,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:DEB77-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -6706,7 +6392,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
@@ -6719,10 +6405,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS65-64-STD-BIG2"
         ],
         "types": [
           "raw-pc"
@@ -6732,7 +6418,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -6745,7 +6431,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -6758,23 +6444,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rnet.missouri.edu+authority+cm"
+          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV"
         ],
         "types": [
           "raw-pc"
@@ -6784,7 +6457,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -6797,7 +6470,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -6810,7 +6483,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -6823,10 +6496,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -6836,10 +6509,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -6849,10 +6522,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -6862,10 +6535,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "emulab-xen"
@@ -6875,10 +6548,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -6888,10 +6561,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -6901,10 +6574,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-xen"
@@ -6914,36 +6587,36 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -6953,10 +6626,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -6966,10 +6639,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -6979,10 +6652,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -6992,10 +6665,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -7005,59 +6678,59 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+exogeni.net:bbnvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOMedium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+exogeni.net:bbnvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOSmall"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+exogeni.net:bbnvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOXlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.metrodatacenter.com+authority+cm"
+          "urn:publicid:IDN+exogeni.net:bbnvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOLarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -7070,7 +6743,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -7083,7 +6756,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -7096,10 +6769,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:DEB77-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -7109,10 +6782,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -7122,10 +6795,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS65-64-STD-BIG2"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -7135,7 +6808,20 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+        ],
+        "images": [
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+        ],
+        "types": [
+          "emulab-xen"
+        ]
+      }
+    },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -7148,7 +6834,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -7161,7 +6847,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -7174,7 +6860,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -7187,10 +6873,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:DEB77-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -7200,10 +6886,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -7213,10 +6899,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS65-64-STD-BIG2"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -7226,10 +6912,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -7239,10 +6925,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -7252,10 +6938,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wall1.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -7265,332 +6951,332 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
           "!"
         ],
         "types": [
-          "emulab-openvz"
+          "m1.medium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "centos-7.0"
         ],
         "types": [
-          "emulab-openvz"
+          "m1.medium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "!"
+          "ubuntu-12.04"
         ],
         "types": [
-          "emulab-xen"
+          "m1.medium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "fedora-19"
         ],
         "types": [
-          "emulab-xen"
+          "m1.medium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "ubuntu-14.04"
         ],
         "types": [
-          "emulab-xen"
+          "m1.medium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "m1.tiny"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "centos-7.0"
         ],
         "types": [
-          "emulab-xen"
+          "m1.tiny"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "ubuntu-12.04"
         ],
         "types": [
-          "emulab-xen"
+          "m1.tiny"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "fedora-19"
         ],
         "types": [
-          "emulab-xen"
+          "m1.tiny"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "ubuntu-14.04"
         ],
         "types": [
-          "emulab-xen"
+          "m1.tiny"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "m1.small"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "centos-7.0"
         ],
         "types": [
-          "emulab-xen"
+          "m1.small"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "!"
+          "ubuntu-12.04"
         ],
         "types": [
-          "raw-pc"
+          "m1.small"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "fedora-19"
         ],
         "types": [
-          "raw-pc"
+          "m1.small"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "ubuntu-14.04"
         ],
         "types": [
-          "raw-pc"
+          "m1.small"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "m1.xlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "centos-7.0"
         ],
         "types": [
-          "raw-pc"
+          "m1.xlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "ubuntu-12.04"
         ],
         "types": [
-          "raw-pc"
+          "m1.xlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "fedora-19"
         ],
         "types": [
-          "raw-pc"
+          "m1.xlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "ubuntu-14.04"
         ],
         "types": [
-          "raw-pc"
+          "m1.xlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.iu.edu+authority+cm"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "m1.large"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:bbnvmsite+authority+am"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "!"
+          "centos-7.0"
         ],
         "types": [
-          "XOSmall"
+          "m1.large"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:bbnvmsite+authority+am"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "!"
+          "ubuntu-12.04"
         ],
         "types": [
-          "XOLarge"
+          "m1.large"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:bbnvmsite+authority+am"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "!"
+          "fedora-19"
         ],
         "types": [
-          "XOMedium"
+          "m1.large"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:bbnvmsite+authority+am"
+          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
         ],
         "images": [
-          "!"
+          "ubuntu-14.04"
         ],
         "types": [
-          "XOXlarge"
+          "m1.large"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -7603,7 +7289,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -7616,7 +7302,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -7629,23 +7315,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -7655,10 +7328,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -7668,10 +7341,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -7681,7 +7354,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
@@ -7694,7 +7367,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
@@ -7707,7 +7380,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
@@ -7720,7 +7393,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -7733,23 +7406,23 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -7759,7 +7432,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
@@ -7772,10 +7445,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -7785,10 +7458,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -7798,10 +7471,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -7811,10 +7484,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -7824,1128 +7497,140 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.clemson.edu+authority+cm"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
-          "m1.medium"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "centos-7.0"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "m1.medium"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "ubuntu-12.04"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "m1.medium"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "fedora-19"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "m1.medium"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "ubuntu-14.04"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "m1.medium"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "m1.tiny"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "centos-7.0"
-        ],
-        "types": [
-          "m1.tiny"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "ubuntu-12.04"
-        ],
-        "types": [
-          "m1.tiny"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "fedora-19"
-        ],
-        "types": [
-          "m1.tiny"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "ubuntu-14.04"
-        ],
-        "types": [
-          "m1.tiny"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "m1.small"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "centos-7.0"
-        ],
-        "types": [
-          "m1.small"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "ubuntu-12.04"
-        ],
-        "types": [
-          "m1.small"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "fedora-19"
-        ],
-        "types": [
-          "m1.small"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "ubuntu-14.04"
-        ],
-        "types": [
-          "m1.small"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "m1.xlarge"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "centos-7.0"
-        ],
-        "types": [
-          "m1.xlarge"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "ubuntu-12.04"
-        ],
-        "types": [
-          "m1.xlarge"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "fedora-19"
-        ],
-        "types": [
-          "m1.xlarge"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "ubuntu-14.04"
-        ],
-        "types": [
-          "m1.xlarge"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "m1.large"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "centos-7.0"
-        ],
-        "types": [
-          "m1.large"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "ubuntu-12.04"
-        ],
-        "types": [
-          "m1.large"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "fedora-19"
-        ],
-        "types": [
-          "m1.large"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+bbn-cam-ctrl-1.gpolab.bbn.com+authority+am"
-        ],
-        "images": [
-          "ubuntu-14.04"
-        ],
-        "types": [
-          "m1.large"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "!"
         ],
         "types": [
           "raw-pc"
@@ -8955,10 +7640,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -8968,10 +7653,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -8981,59 +7666,59 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:fiuvmsite+authority+am"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
-          "XOSmall"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:fiuvmsite+authority+am"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
-          "XOLarge"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:fiuvmsite+authority+am"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "XOMedium"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+exogeni.net:fiuvmsite+authority+am"
+          "urn:publicid:IDN+instageni.stanford.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "XOXlarge"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -9046,7 +7731,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -9059,7 +7744,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -9072,10 +7757,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -9085,10 +7770,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9098,10 +7783,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -9111,10 +7796,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9124,10 +7809,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9137,10 +7822,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9150,10 +7835,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9163,36 +7848,36 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -9202,10 +7887,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -9215,10 +7900,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -9228,10 +7913,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -9241,10 +7926,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+instageni.idre.ucla.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -9254,52 +7939,52 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:fiuvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOMedium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:fiuvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOSmall"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:fiuvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOXlarge"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:fiuvmsite+authority+am"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "XOLarge"
         ]
       }
     },
@@ -9309,20 +7994,20 @@
           "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-openvz"
@@ -9332,23 +8017,23 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "!"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -9358,10 +8043,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9371,10 +8056,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -9384,10 +8069,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9397,10 +8082,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9410,10 +8095,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9423,10 +8108,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9436,7 +8121,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -9449,10 +8134,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -9462,10 +8147,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -9475,10 +8160,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -9488,10 +8173,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -9501,10 +8186,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -9514,10 +8199,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+          "urn:publicid:IDN+genirack.nyu.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -9527,7 +8212,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
           "!"
@@ -9540,7 +8225,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -9553,7 +8238,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
           "!"
@@ -9566,10 +8251,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9579,10 +8264,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -9592,10 +8277,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -9605,10 +8290,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9618,10 +8303,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9631,10 +8316,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9644,10 +8329,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
         ],
         "types": [
           "emulab-xen"
@@ -9657,7 +8342,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
           "!"
@@ -9670,10 +8355,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
         ],
         "types": [
           "raw-pc"
@@ -9683,10 +8368,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -9696,10 +8381,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -9709,10 +8394,23 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+        ],
+        "types": [
+          "raw-pc"
+        ]
+      }
+    },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
+        ],
+        "images": [
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -9722,10 +8420,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
         ],
         "types": [
           "raw-pc"
@@ -9738,10 +8436,10 @@
           "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
@@ -9751,33 +8449,33 @@
           "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
           "!"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -9787,7 +8485,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
@@ -9800,10 +8498,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -9813,10 +8511,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9826,10 +8524,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -9839,7 +8537,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
@@ -9852,7 +8550,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
           "!"
@@ -9865,7 +8563,7 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
           "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
@@ -9878,10 +8576,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -9891,10 +8589,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -9904,10 +8602,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -9917,26 +8615,26 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
@@ -9949,7 +8647,7 @@
           "!"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -9959,10 +8657,10 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -9972,7 +8670,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "!"
         ],
         "types": [
           "emulab-xen"
@@ -9985,7 +8683,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -9998,7 +8696,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10011,7 +8709,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -10024,7 +8722,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10037,7 +8735,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10050,7 +8748,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10063,7 +8761,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10089,20 +8787,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -10115,7 +8800,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -10128,7 +8813,7 @@
           "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -10174,32 +8859,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.illinois.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -10245,20 +8904,7 @@
           "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -10271,7 +8917,7 @@
           "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10284,7 +8930,7 @@
           "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -10343,19 +8989,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -10375,20 +9008,7 @@
           "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -10401,7 +9021,7 @@
           "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -10414,7 +9034,7 @@
           "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -10460,58 +9080,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.gpolab.bbn.com+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.nps.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.nps.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -10521,33 +9089,7 @@
           "!"
         ],
         "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.nps.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.nps.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
-        ],
-        "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -10557,10 +9099,10 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -10570,7 +9112,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "!"
         ],
         "types": [
           "emulab-xen"
@@ -10583,7 +9125,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -10596,7 +9138,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10609,7 +9151,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -10622,7 +9164,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10635,7 +9177,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10648,10 +9190,10 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -10661,10 +9203,10 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -10674,7 +9216,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "!"
         ],
         "types": [
           "raw-pc"
@@ -10687,7 +9229,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -10700,7 +9242,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -10713,7 +9255,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -10726,7 +9268,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -10739,7 +9281,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -10752,7 +9294,7 @@
           "urn:publicid:IDN+instageni.nps.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -10817,20 +9359,7 @@
           "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -10843,7 +9372,7 @@
           "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -10856,7 +9385,7 @@
           "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -10915,19 +9444,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -10960,20 +9476,7 @@
           "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -10986,7 +9489,7 @@
           "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -10999,7 +9502,7 @@
           "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -11045,32 +9548,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.rutgers.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -11080,7 +9557,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOSmall"
         ]
       }
     },
@@ -11093,7 +9570,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOLarge"
         ]
       }
     },
@@ -11106,7 +9583,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOMedium"
         ]
       }
     },
@@ -11119,7 +9596,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOXlarge"
         ]
       }
     },
@@ -11168,20 +9645,7 @@
           "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -11194,7 +9658,7 @@
           "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -11207,7 +9671,7 @@
           "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -11266,19 +9730,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -11298,20 +9749,7 @@
           "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -11324,7 +9762,7 @@
           "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -11337,7 +9775,7 @@
           "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -11386,26 +9824,13 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
+          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-openvz"
         ]
       }
     },
@@ -11415,7 +9840,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
           "emulab-openvz"
@@ -11483,124 +9908,59 @@
           "urn:publicid:IDN+emulab.net+image+wall2-ilabt-iminds-be:SummerSchoolContiki2015"
         ],
         "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-wilab"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-usrp"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-OMF54-USRP"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
+          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-wilab"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
+          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GENERICDEV"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
+          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-usrp"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
+          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-OMF54-USRP"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
@@ -11610,10 +9970,10 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -11623,10 +9983,10 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -11636,7 +9996,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "!"
         ],
         "types": [
           "emulab-xen"
@@ -11649,7 +10009,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -11662,7 +10022,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -11675,7 +10035,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -11688,7 +10048,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "emulab-xen"
@@ -11701,10 +10061,10 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "!"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -11714,10 +10074,10 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -11727,10 +10087,10 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -11740,7 +10100,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "!"
         ],
         "types": [
           "raw-pc"
@@ -11753,7 +10113,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -11766,7 +10126,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -11779,7 +10139,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -11792,7 +10152,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -11805,7 +10165,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -11818,7 +10178,7 @@
           "urn:publicid:IDN+instageni.nysernet.org+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -11870,20 +10230,7 @@
           "urn:publicid:IDN+instageni.cenic.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.cenic.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -11896,7 +10243,7 @@
           "urn:publicid:IDN+instageni.cenic.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -11909,7 +10256,7 @@
           "urn:publicid:IDN+instageni.cenic.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -11987,20 +10334,7 @@
           "urn:publicid:IDN+instageni.cenic.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.cenic.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -12013,7 +10347,7 @@
           "urn:publicid:IDN+instageni.cenic.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -12026,7 +10360,7 @@
           "urn:publicid:IDN+instageni.cenic.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -12117,20 +10451,7 @@
           "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -12143,7 +10464,7 @@
           "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -12156,7 +10477,7 @@
           "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -12215,19 +10536,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -12247,20 +10555,7 @@
           "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -12273,7 +10568,7 @@
           "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -12286,7 +10581,7 @@
           "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -12332,32 +10627,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.wisc.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -12367,7 +10636,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOMedium"
         ]
       }
     },
@@ -12380,7 +10649,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOSmall"
         ]
       }
     },
@@ -12393,7 +10662,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOXlarge"
         ]
       }
     },
@@ -12406,7 +10675,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOLarge"
         ]
       }
     },
@@ -12650,20 +10919,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -12676,7 +10932,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -12689,7 +10945,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -12728,62 +10984,10 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
-        ],
-        "images": [
-          "!"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -12793,10 +10997,10 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:OPENVZ-STD"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -12806,7 +11010,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "!"
         ],
         "types": [
           "raw-pc"
@@ -12819,7 +11023,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -12832,7 +11036,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -12845,7 +11049,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -12858,7 +11062,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD92-STD"
         ],
         "types": [
           "raw-pc"
@@ -12871,7 +11075,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -12884,7 +11088,7 @@
           "urn:publicid:IDN+geni.it.cornell.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -12900,7 +11104,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOMedium"
         ]
       }
     },
@@ -12913,7 +11117,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOSmall"
         ]
       }
     },
@@ -12926,7 +11130,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOXlarge"
         ]
       }
     },
@@ -12939,7 +11143,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOLarge"
         ]
       }
     },
@@ -12988,20 +11192,7 @@
           "urn:publicid:IDN+geni.case.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.case.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -13014,7 +11205,7 @@
           "urn:publicid:IDN+geni.case.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -13027,7 +11218,7 @@
           "urn:publicid:IDN+geni.case.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -13073,19 +11264,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.case.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -13105,20 +11283,7 @@
           "urn:publicid:IDN+geni.case.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.case.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -13131,7 +11296,7 @@
           "urn:publicid:IDN+geni.case.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -13144,7 +11309,7 @@
           "urn:publicid:IDN+geni.case.edu+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -13177,19 +11342,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+geni.case.edu+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -13482,20 +11634,7 @@
           "urn:publicid:IDN+instageni.sox.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.sox.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "emulab-xen"
@@ -13508,7 +11647,7 @@
           "urn:publicid:IDN+instageni.sox.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "emulab-xen"
@@ -13521,7 +11660,7 @@
           "urn:publicid:IDN+instageni.sox.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "emulab-xen"
@@ -13567,19 +11706,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.sox.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -13593,19 +11719,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.sox.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "emulab-xen"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -13625,20 +11738,7 @@
           "urn:publicid:IDN+instageni.sox.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.sox.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FBSD82-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
         ],
         "types": [
           "raw-pc"
@@ -13651,7 +11751,7 @@
           "urn:publicid:IDN+instageni.sox.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:Ubuntu12-64-OVS"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:CENTOS66-64-STD"
         ],
         "types": [
           "raw-pc"
@@ -13664,7 +11764,7 @@
           "urn:publicid:IDN+instageni.sox.net+authority+cm"
         ],
         "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU12-64-STD"
+          "urn:publicid:IDN+emulab.net+image+emulab-ops:GDXEN160218"
         ],
         "types": [
           "raw-pc"
@@ -13710,32 +11810,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.sox.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:FEDORA15-STD"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.sox.net+authority+cm"
-        ],
-        "images": [
-          "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU14-OVS2.31"
-        ],
-        "types": [
-          "raw-pc"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -13745,7 +11819,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOMedium"
         ]
       }
     },
@@ -13758,7 +11832,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOSmall"
         ]
       }
     },
@@ -13771,7 +11845,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOXlarge"
         ]
       }
     },
@@ -13784,7 +11858,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOLarge"
         ]
       }
     },
@@ -13797,7 +11871,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOSmall"
         ]
       }
     },
@@ -13810,7 +11884,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOLarge"
         ]
       }
     },
@@ -13823,7 +11897,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOMedium"
         ]
       }
     },
@@ -13836,7 +11910,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOXlarge"
         ]
       }
     },
@@ -13846,10 +11920,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "!"
+          "m510"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -13859,10 +11933,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "m510"
+          "x86_64"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -13872,10 +11946,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "m510-vm"
+          "aarch64"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -13885,10 +11959,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "x86_64-vm"
+          "dboxvm-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -13898,10 +11972,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "x86_64"
+          "dboxvm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -13911,7 +11985,7 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "m510"
+          "m510-vm"
         ],
         "types": [
           "!"
@@ -13924,7 +11998,7 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "x86_64"
+          "x86_64-vm"
         ],
         "types": [
           "!"
@@ -13937,10 +12011,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "aarch64"
+          "!"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -13950,10 +12024,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "dboxvm-vm"
+          "m510"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -13963,10 +12037,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "dboxvm"
+          "m510-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -13976,10 +12050,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "m510-vm"
+          "x86_64-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -13989,10 +12063,10 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "x86_64-vm"
+          "x86_64"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14080,7 +12154,7 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "m510"
+          "x86_64"
         ],
         "types": [
           "raw-pc"
@@ -14093,7 +12167,7 @@
           "urn:publicid:IDN+utah.cloudlab.us+authority+cm"
         ],
         "hardware": [
-          "x86_64"
+          "m510"
         ],
         "types": [
           "raw-pc"
@@ -14145,10 +12219,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "!"
+          ""
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14161,7 +12235,7 @@
           "x86_64"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14171,10 +12245,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-d710"
+          "delay-d430"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14184,10 +12258,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "delay-d430"
+          "pc2400c2"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14197,10 +12271,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          ""
+          "bridge"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14210,10 +12284,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "firewall"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14223,10 +12297,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "firewall"
+          "delay-d430k"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14236,10 +12310,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "nuc5300"
+          "d530"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14249,10 +12323,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d430k-vm"
+          "d430"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14262,10 +12336,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-d430k"
+          "nuc5300"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14278,7 +12352,7 @@
           "d430k"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14288,10 +12362,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "nuc5300-vm"
+          "bridge-pc3000"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14301,10 +12375,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "delay-d430k"
+          "-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14314,10 +12388,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-d430"
+          "x86_64-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14327,10 +12401,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d710"
+          "bridge-d430k"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14340,10 +12414,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d430-vm"
+          "d710"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14353,10 +12427,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "-vm"
+          "d430-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14366,10 +12440,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "x86_64-vm"
+          "d530-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14379,10 +12453,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d430"
+          "bridge-d710"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -14392,7 +12466,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          ""
+          "nuc5300-vm"
         ],
         "types": [
           "!"
@@ -14405,7 +12479,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "x86_64"
+          "bridge-d430"
         ],
         "types": [
           "!"
@@ -14418,7 +12492,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "delay-d430"
+          "ue"
         ],
         "types": [
           "!"
@@ -14431,7 +12505,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc2400c2"
+          "nexus5"
         ],
         "types": [
           "!"
@@ -14444,7 +12518,7 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "d430k-vm"
         ],
         "types": [
           "!"
@@ -14457,10 +12531,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "firewall"
+          "!"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14470,10 +12544,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "delay-d430k"
+          "x86_64"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14483,10 +12557,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d530"
+          "bridge-d710"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14496,10 +12570,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d430"
+          "delay-d430"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14509,10 +12583,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "nuc5300"
+          ""
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14522,10 +12596,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d430k"
+          "bridge"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14535,10 +12609,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc3000"
+          "firewall"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14548,10 +12622,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "-vm"
+          "nuc5300"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14561,10 +12635,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "x86_64-vm"
+          "d430k-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14577,7 +12651,7 @@
           "bridge-d430k"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14587,10 +12661,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d710"
+          "d430k"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14600,10 +12674,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d430-vm"
+          "nuc5300-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14613,10 +12687,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d530-vm"
+          "delay-d430k"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14626,10 +12700,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-d710"
+          "bridge-d430"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14639,10 +12713,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "nuc5300-vm"
+          "d710"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14652,10 +12726,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-d430"
+          "d430-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14665,10 +12739,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "ue"
+          "-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14678,10 +12752,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "nexus5"
+          "x86_64-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -14691,10 +12765,10 @@
           "urn:publicid:IDN+emulab.net+authority+cm"
         ],
         "hardware": [
-          "d430k-vm"
+          "d430"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -15864,7 +13938,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOSmall"
         ]
       }
     },
@@ -15877,7 +13951,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOLarge"
         ]
       }
     },
@@ -15890,7 +13964,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOMedium"
         ]
       }
     },
@@ -15903,7 +13977,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOXlarge"
         ]
       }
     },
@@ -16888,7 +14962,7 @@
           "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          ""
         ],
         "types": [
           "!"
@@ -16908,6 +14982,32 @@
         ]
       }
     },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+        ],
+        "hardware": [
+          "-vm"
+        ],
+        "types": [
+          "!"
+        ]
+      }
+    },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+        ],
+        "hardware": [
+          "dl360"
+        ],
+        "types": [
+          "!"
+        ]
+      }
+    },
     {
       "node": {
         "aggregates": [
@@ -16934,6 +15034,19 @@
         ]
       }
     },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+        ],
+        "hardware": [
+          ""
+        ],
+        "types": [
+          "emulab-openvz"
+        ]
+      }
+    },
     {
       "node": {
         "aggregates": [
@@ -16969,7 +15082,72 @@
           "bridge-dl360"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-openvz"
+        ]
+      }
+    },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+        ],
+        "hardware": [
+          "-vm"
+        ],
+        "types": [
+          "emulab-openvz"
+        ]
+      }
+    },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+        ],
+        "hardware": [
+          "!"
+        ],
+        "types": [
+          "emulab-xen"
+        ]
+      }
+    },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+        ],
+        "hardware": [
+          ""
+        ],
+        "types": [
+          "emulab-xen"
+        ]
+      }
+    },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+        ],
+        "hardware": [
+          "bridge"
+        ],
+        "types": [
+          "emulab-xen"
+        ]
+      }
+    },
+    {
+      "node": {
+        "aggregates": [
+          "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
+        ],
+        "hardware": [
+          "dl360"
+        ],
+        "types": [
+          "emulab-xen"
         ]
       }
     },
@@ -16979,7 +15157,7 @@
           "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "hardware": [
-          "!"
+          "bridge-dl360"
         ],
         "types": [
           "emulab-xen"
@@ -16992,7 +15170,7 @@
           "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "-vm"
         ],
         "types": [
           "emulab-xen"
@@ -17005,10 +15183,10 @@
           "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          "!"
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
@@ -17018,10 +15196,10 @@
           "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          ""
         ],
         "types": [
-          "emulab-xen"
+          "raw-pc"
         ]
       }
     },
@@ -17031,7 +15209,7 @@
           "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "hardware": [
-          "!"
+          "bridge"
         ],
         "types": [
           "raw-pc"
@@ -17044,7 +15222,7 @@
           "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "dl360"
         ],
         "types": [
           "raw-pc"
@@ -17057,7 +15235,7 @@
           "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          "bridge-dl360"
         ],
         "types": [
           "raw-pc"
@@ -17070,7 +15248,7 @@
           "urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          "-vm"
         ],
         "types": [
           "raw-pc"
@@ -19426,7 +17604,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOMedium"
         ]
       }
     },
@@ -19439,7 +17617,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOSmall"
         ]
       }
     },
@@ -19452,7 +17630,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOXlarge"
         ]
       }
     },
@@ -19465,7 +17643,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOLarge"
         ]
       }
     },
@@ -20323,7 +18501,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOMedium"
         ]
       }
     },
@@ -20336,7 +18514,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOSmall"
         ]
       }
     },
@@ -20349,7 +18527,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOXlarge"
         ]
       }
     },
@@ -20362,7 +18540,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOLarge"
         ]
       }
     },
@@ -20567,179 +18745,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc3300"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "bridge"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "pc3300-vm"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "pc3500"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "pc3500-vm"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "delay-pc3300"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "pcvm3500"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "delay-pc3400"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "pcvm3300"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "pc3300"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "bridge-pc3500"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "bridge-pc2400"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "pc3400-vm"
-        ],
-        "types": [
           "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "delay-pc3500"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -20749,10 +18758,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc3000"
+          ""
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -20762,10 +18771,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3400"
+          "bridge"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -20777,32 +18786,6 @@
         "hardware": [
           "pcvm3400"
         ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "bridge-pc3400"
-        ],
-        "types": [
-          "!"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+uky.emulab.net+authority+cm"
-        ],
-        "hardware": [
-          "!"
-        ],
         "types": [
           "emulab-openvz"
         ]
@@ -20814,7 +18797,7 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "delay-pc3400"
         ],
         "types": [
           "emulab-openvz"
@@ -20827,7 +18810,7 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "delay-pc3400"
+          "bridge-pc2400"
         ],
         "types": [
           "emulab-openvz"
@@ -20840,7 +18823,7 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc2400"
+          "pc3400-vm"
         ],
         "types": [
           "emulab-openvz"
@@ -20853,7 +18836,7 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3400-vm"
+          "bridge-pc3000"
         ],
         "types": [
           "emulab-openvz"
@@ -20866,7 +18849,7 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc3000"
+          "pc3400"
         ],
         "types": [
           "emulab-openvz"
@@ -20879,7 +18862,7 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3400"
+          "-vm"
         ],
         "types": [
           "emulab-openvz"
@@ -20892,7 +18875,7 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pcvm3400"
+          "bridge-pc3400"
         ],
         "types": [
           "emulab-openvz"
@@ -20905,10 +18888,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc3400"
+          ""
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -20918,10 +18901,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "!"
+          "bridge"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -20931,10 +18914,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc3300"
+          "pc3300-vm"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -20944,10 +18927,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3300-vm"
+          "pc3500"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -20957,10 +18940,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3500"
+          "delay-pc3300"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -20970,10 +18953,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3500-vm"
+          "bridge-pc3300"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -20983,10 +18966,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "delay-pc3300"
+          "pc3500-vm"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -20996,10 +18979,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pcvm3500"
+          "delay-pc3400"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21009,10 +18992,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "delay-pc3400"
+          "pcvm3400"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21022,10 +19005,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pcvm3300"
+          "delay-pc3500"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21035,10 +19018,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3300"
+          "pcvm3300"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21048,10 +19031,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc3500"
+          "pc3300"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21061,10 +19044,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3400-vm"
+          "bridge-pc3500"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21074,10 +19057,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc2400"
+          "pc3400-vm"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21087,10 +19070,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "bridge-pc2400"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21100,10 +19083,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "delay-pc3500"
+          "pcvm3500"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21116,7 +19099,7 @@
           "bridge-pc3000"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21129,7 +19112,7 @@
           "pc3400"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21139,10 +19122,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pcvm3400"
+          "-vm"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21155,7 +19138,7 @@
           "bridge-pc3400"
         ],
         "types": [
-          "emulab-xen"
+          "!"
         ]
       }
     },
@@ -21168,7 +19151,7 @@
           "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -21178,10 +19161,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          ""
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -21191,10 +19174,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "delay-pc3400"
+          "pc3300-vm"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -21204,10 +19187,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc2400"
+          "pc3500"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -21217,10 +19200,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3400-vm"
+          "bridge"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -21230,10 +19213,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc3000"
+          "bridge-pc3300"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -21243,10 +19226,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pc3400"
+          "pc3500-vm"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -21256,10 +19239,10 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "pcvm3400"
+          "delay-pc3300"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -21269,111 +19252,111 @@
           "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-pc3400"
+          "delay-pc3400"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          "pcvm3400"
         ],
         "types": [
-          "!"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "delay-pc3500"
         ],
         "types": [
-          "!"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          "pcvm3300"
         ],
         "types": [
-          "!"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "!"
+          "pc3300"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "bridge-pc3500"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          "pc3400-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          "bridge-pc2400"
         ],
         "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "!"
+          "pcvm3500"
         ],
         "types": [
           "emulab-xen"
@@ -21383,10 +19366,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "bridge-pc3000"
         ],
         "types": [
           "emulab-xen"
@@ -21396,10 +19379,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          "pc3400"
         ],
         "types": [
           "emulab-xen"
@@ -21409,10 +19392,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          "-vm"
         ],
         "types": [
           "emulab-xen"
@@ -21422,23 +19405,23 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "!"
+          "bridge-pc3400"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "!"
         ],
         "types": [
           "raw-pc"
@@ -21448,10 +19431,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          ""
         ],
         "types": [
           "raw-pc"
@@ -21461,10 +19444,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          "bridge"
         ],
         "types": [
           "raw-pc"
@@ -21474,114 +19457,114 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "!"
+          "pcvm3400"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "x86_64"
+          "delay-pc3400"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "bridge-pc2400"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          "pc3400-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          "bridge-pc3000"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "x86_64-vm"
+          "pc3400"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          "-vm"
         ],
         "types": [
-          "!"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+uky.emulab.net+authority+cm"
         ],
         "hardware": [
-          "x86_64"
+          "bridge-pc3400"
         ],
         "types": [
-          "!"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          "dl360"
         ],
         "types": [
           "!"
@@ -21591,10 +19574,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "x86_64-vm"
+          "bridge"
         ],
         "types": [
           "!"
@@ -21604,10 +19587,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "bridge-dl360"
         ],
         "types": [
           "!"
@@ -21617,62 +19600,62 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
           "!"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "x86_64"
+          "bridge"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "dl360"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          "bridge-dl360"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          "!"
         ],
         "types": [
           "emulab-xen"
@@ -21682,10 +19665,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "x86_64-vm"
+          "bridge"
         ],
         "types": [
           "emulab-xen"
@@ -21695,36 +19678,36 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "!"
+          "dl360"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "x86_64"
+          "bridge-dl360"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "bridge"
+          "!"
         ],
         "types": [
           "raw-pc"
@@ -21734,10 +19717,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "dl360"
+          "bridge"
         ],
         "types": [
           "raw-pc"
@@ -21747,10 +19730,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "bridge-dl360"
+          "dl360"
         ],
         "types": [
           "raw-pc"
@@ -21760,10 +19743,10 @@
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
+          "urn:publicid:IDN+instageni.utc.edu+authority+cm"
         ],
         "hardware": [
-          "x86_64-vm"
+          "bridge-dl360"
         ],
         "types": [
           "raw-pc"
@@ -22550,19 +20533,6 @@
         ]
       }
     },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am"
-        ],
-        "hardware": [
-          "!"
-        ],
-        "types": [
-          "XOMedium"
-        ]
-      }
-    },
     {
       "node": {
         "aggregates": [
@@ -22585,7 +20555,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOLarge"
         ]
       }
     },
@@ -22598,59 +20568,20 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOMedium"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
+          "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am"
         ],
         "hardware": [
           "!"
         ],
         "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
-        ],
-        "hardware": [
-          "bridge"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
-        ],
-        "hardware": [
-          "dl360"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
-        ],
-        "hardware": [
-          "bridge-dl360"
-        ],
-        "types": [
-          "emulab-openvz"
+          "XOXlarge"
         ]
       }
     },
@@ -22702,7 +20633,7 @@
           "!"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -22715,7 +20646,7 @@
           "bridge"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -22728,7 +20659,7 @@
           "dl360"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -22741,7 +20672,7 @@
           "bridge-dl360"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -22754,7 +20685,7 @@
           "!"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -22767,7 +20698,7 @@
           "bridge"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -22780,7 +20711,7 @@
           "dl360"
         ],
         "types": [
-          "raw-pc"
+          "emulab-xen"
         ]
       }
     },
@@ -22793,189 +20724,59 @@
           "bridge-dl360"
         ],
         "types": [
-          "raw-pc"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "LTE-FEMTOCELL"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "DSS-vm"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "ZOTAC1P"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "SERVER1P"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "ZOTAC-vm"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "APU-vm"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "USRP"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "SERVER5P-vm"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "SERVER1G2X-vm"
-        ],
-        "types": [
-          "emulab-openvz"
-        ]
-      }
-    },
-    {
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
-        ],
-        "hardware": [
-          "!"
-        ],
-        "types": [
-          "emulab-openvz"
+          "emulab-xen"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "hardware": [
-          "TLVAP"
+          "!"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "hardware": [
-          "MOBILE-vm"
+          "bridge"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "hardware": [
-          "SERVER5P"
+          "dl360"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
     {
       "node": {
         "aggregates": [
-          "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
+          "urn:publicid:IDN+instageni.northwestern.edu+authority+cm"
         ],
         "hardware": [
-          "SERVER1G2X"
+          "bridge-dl360"
         ],
         "types": [
-          "emulab-openvz"
+          "raw-pc"
         ]
       }
     },
@@ -22985,10 +20786,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ARDUINO"
+          "LTE-FEMTOCELL"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -22998,10 +20799,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ZOTAC"
+          "DSS-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -23011,10 +20812,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "DSS"
+          "ZOTAC1P"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -23024,10 +20825,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "WARP"
+          "SERVER1P"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -23037,10 +20838,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER1P-vm"
+          "ZOTAC-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -23050,10 +20851,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "RASPBERRYPI"
+          "APU-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -23063,10 +20864,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ZOTAC1P-vm"
+          "USRP"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -23076,10 +20877,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "MOBILE"
+          "SERVER5P-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -23089,10 +20890,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "APU"
+          "SERVER1G2X-vm"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -23102,10 +20903,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ALIX"
+          "TLVAP"
         ],
         "types": [
-          "emulab-openvz"
+          "!"
         ]
       }
     },
@@ -23115,7 +20916,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "LTE-FEMTOCELL"
+          "MOBILE-vm"
         ],
         "types": [
           "!"
@@ -23128,7 +20929,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "DSS-vm"
+          "SERVER5P"
         ],
         "types": [
           "!"
@@ -23141,7 +20942,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ZOTAC1P"
+          "SERVER1G2X"
         ],
         "types": [
           "!"
@@ -23154,7 +20955,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER1P"
+          "ARDUINO"
         ],
         "types": [
           "!"
@@ -23167,7 +20968,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ZOTAC-vm"
+          "ZOTAC"
         ],
         "types": [
           "!"
@@ -23180,7 +20981,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "APU-vm"
+          "DSS"
         ],
         "types": [
           "!"
@@ -23193,7 +20994,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "USRP"
+          "WARP"
         ],
         "types": [
           "!"
@@ -23206,7 +21007,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER5P-vm"
+          "SERVER1P-vm"
         ],
         "types": [
           "!"
@@ -23219,7 +21020,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER1G2X-vm"
+          "RASPBERRYPI"
         ],
         "types": [
           "!"
@@ -23232,7 +21033,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "TLVAP"
+          "ZOTAC1P-vm"
         ],
         "types": [
           "!"
@@ -23245,7 +21046,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "MOBILE-vm"
+          "MOBILE"
         ],
         "types": [
           "!"
@@ -23258,7 +21059,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER5P"
+          "APU"
         ],
         "types": [
           "!"
@@ -23271,7 +21072,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER1G2X"
+          "ALIX"
         ],
         "types": [
           "!"
@@ -23284,10 +21085,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ARDUINO"
+          "!"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23297,10 +21098,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ZOTAC"
+          "DSS-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23310,10 +21111,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "DSS"
+          "APU"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23323,10 +21124,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "WARP"
+          "SERVER1P"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23336,10 +21137,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER1P-vm"
+          "ZOTAC-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23349,10 +21150,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "RASPBERRYPI"
+          "MOBILE"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23362,10 +21163,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ZOTAC1P-vm"
+          "ZOTAC"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23375,10 +21176,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "MOBILE"
+          "APU-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23388,10 +21189,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "APU"
+          "MOBILE-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23401,10 +21202,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ALIX"
+          "SERVER5P-vm"
         ],
         "types": [
-          "!"
+          "emulab-openvz"
         ]
       }
     },
@@ -23414,10 +21215,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "LTE-FEMTOCELL"
+          "DSS"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -23427,10 +21228,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "DSS-vm"
+          "SERVER5P"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -23443,7 +21244,7 @@
           "ZOTAC1P"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -23453,10 +21254,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER1P"
+          "ZOTAC1P-vm"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -23466,10 +21267,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ZOTAC-vm"
+          "SERVER1G2X"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -23479,10 +21280,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "APU-vm"
+          "SERVER1P-vm"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -23492,10 +21293,10 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "USRP"
+          "SERVER1G2X-vm"
         ],
         "types": [
-          "emulab-xen"
+          "emulab-openvz"
         ]
       }
     },
@@ -23505,7 +21306,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER5P-vm"
+          "!"
         ],
         "types": [
           "emulab-xen"
@@ -23518,7 +21319,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER1G2X-vm"
+          "DSS-vm"
         ],
         "types": [
           "emulab-xen"
@@ -23531,7 +21332,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "!"
+          "APU"
         ],
         "types": [
           "emulab-xen"
@@ -23544,7 +21345,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "TLVAP"
+          "SERVER1P"
         ],
         "types": [
           "emulab-xen"
@@ -23557,7 +21358,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "MOBILE-vm"
+          "ZOTAC-vm"
         ],
         "types": [
           "emulab-xen"
@@ -23570,7 +21371,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER5P"
+          "MOBILE"
         ],
         "types": [
           "emulab-xen"
@@ -23583,7 +21384,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER1G2X"
+          "ZOTAC"
         ],
         "types": [
           "emulab-xen"
@@ -23596,7 +21397,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ARDUINO"
+          "APU-vm"
         ],
         "types": [
           "emulab-xen"
@@ -23609,7 +21410,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ZOTAC"
+          "MOBILE-vm"
         ],
         "types": [
           "emulab-xen"
@@ -23622,7 +21423,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "DSS"
+          "SERVER5P-vm"
         ],
         "types": [
           "emulab-xen"
@@ -23635,7 +21436,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "WARP"
+          "DSS"
         ],
         "types": [
           "emulab-xen"
@@ -23648,7 +21449,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "SERVER1P-vm"
+          "SERVER5P"
         ],
         "types": [
           "emulab-xen"
@@ -23661,7 +21462,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "RASPBERRYPI"
+          "ZOTAC1P"
         ],
         "types": [
           "emulab-xen"
@@ -23687,7 +21488,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "MOBILE"
+          "SERVER1G2X"
         ],
         "types": [
           "emulab-xen"
@@ -23700,7 +21501,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "APU"
+          "SERVER1P-vm"
         ],
         "types": [
           "emulab-xen"
@@ -23713,7 +21514,7 @@
           "urn:publicid:IDN+wilab2.ilabt.iminds.be+authority+cm"
         ],
         "hardware": [
-          "ALIX"
+          "SERVER1G2X-vm"
         ],
         "types": [
           "emulab-xen"
@@ -24626,7 +22427,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOMedium"
         ]
       }
     },
@@ -24639,7 +22440,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOSmall"
         ]
       }
     },
@@ -24652,7 +22453,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOXlarge"
         ]
       }
     },
@@ -24665,7 +22466,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOLarge"
         ]
       }
     },
@@ -25068,7 +22869,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOMedium"
         ]
       }
     },
@@ -25081,7 +22882,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOSmall"
         ]
       }
     },
@@ -25094,7 +22895,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOXlarge"
         ]
       }
     },
@@ -25107,7 +22908,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOLarge"
         ]
       }
     },
@@ -26901,7 +24702,7 @@
           "!"
         ],
         "types": [
-          "XOSmall"
+          "XOMedium"
         ]
       }
     },
@@ -26914,7 +24715,7 @@
           "!"
         ],
         "types": [
-          "XOLarge"
+          "XOSmall"
         ]
       }
     },
@@ -26927,7 +24728,7 @@
           "!"
         ],
         "types": [
-          "XOMedium"
+          "XOXlarge"
         ]
       }
     },
@@ -26940,7 +24741,7 @@
           "!"
         ],
         "types": [
-          "XOXlarge"
+          "XOLarge"
         ]
       }
     },
@@ -28168,7 +25969,6 @@
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
@@ -28196,7 +25996,6 @@
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
@@ -28224,7 +26023,6 @@
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
@@ -28252,7 +26050,6 @@
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
@@ -28280,7 +26077,6 @@
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
@@ -28308,7 +26104,6 @@
           "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
@@ -28336,7 +26131,6 @@
           "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
@@ -28364,35 +26158,6 @@
           "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
-        ]
-      }
-    },
-    {
-      "link": {
-        "linkTypes": [
-          "!"
-        ]
-      },
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am"
-        ]
-      },
-      "node2": {
-        "aggregates": [
-          "urn:publicid:IDN+exogeni.net+authority+am",
-          "urn:publicid:IDN+exogeni.net:fiuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:bbnvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:nictavmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:osfvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
@@ -28421,7 +26186,6 @@
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
@@ -28449,7 +26213,6 @@
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
@@ -28477,7 +26240,6 @@
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wvnvmsite+authority+am"
@@ -28505,7 +26267,6 @@
           "urn:publicid:IDN+exogeni.net:rcivmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:slvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:tamuvmsite+authority+am",
-          "urn:publicid:IDN+exogeni.net:ucdvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uflvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:uhvmsite+authority+am",
           "urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am"
@@ -28550,7 +26311,6 @@
           "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm",
           "urn:publicid:IDN+instageni.research.umich.edu+authority+cm",
           "urn:publicid:IDN+instageni.umkc.edu+authority+cm",
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm",
           "urn:publicid:IDN+utahddc.geniracks.net+authority+cm",
           "urn:publicid:IDN+instageni.utc.edu+authority+cm",
           "urn:publicid:IDN+instageni.washington.edu+authority+cm",
@@ -28593,7 +26353,6 @@
           "urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm",
           "urn:publicid:IDN+instageni.research.umich.edu+authority+cm",
           "urn:publicid:IDN+instageni.umkc.edu+authority+cm",
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm",
           "urn:publicid:IDN+utahddc.geniracks.net+authority+cm",
           "urn:publicid:IDN+instageni.utc.edu+authority+cm",
           "urn:publicid:IDN+instageni.washington.edu+authority+cm",
@@ -29490,23 +27249,6 @@
         ]
       }
     },
-    {
-      "link": {
-        "linkTypes": [
-          "lan"
-        ]
-      },
-      "node": {
-        "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
-        ]
-      },
-      "node2": {
-        "aggregates": [
-          "urn:publicid:IDN+utah.geniracks.net+authority+cm"
-        ]
-      }
-    },
     {
       "link": {
         "linkTypes": [
@@ -29801,6 +27543,8 @@
           "http://geni-images.renci.org/images/dcvan/storm/Storm-SiteAware-v0.2/Storm-SiteAware-v0.2.xml",
           "http://geni-images.renci.org/images/standard/centos/centos6.7-v1.1.0/centos6.7-v1.1.0.xml",
           "http://geni-images.renci.org/images/standard/centos/centos6.8-v1.1.0/centos6.8-v1.1.0.xml",
+          "http://geni-images.renci.org/images/standard/centos/centos6.9-v1.0.0/centos6.9-v1.0.0.xml",
+          "http://geni-images.renci.org/images/standard/centos/centos7.3-v1.0.2/centos7.3-v1.0.2.xml",
           "http://geni-images.renci.org/images/standard/debian/deb6.v1.0.10.xml",
           "http://geni-images.renci.org/images/tqian/u64_32_delay.xml",
           "http://geni-images.renci.org/images/ibaldin/docker/centos6.6-docker-v0.1/centos6.6-docker-v0.1.xml",