diff --git a/data/grid5000/environments/sid-x64-base-1.0.json b/data/grid5000/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/bordeaux.json b/data/grid5000/sites/bordeaux/bordeaux.json
index ee8b6b8e5123aa58f20f5a20431b3dcbdd20f6e7..ad5fc4fec1dae62581c155c1e0dedef623d5467b 100644
--- a/data/grid5000/sites/bordeaux/bordeaux.json
+++ b/data/grid5000/sites/bordeaux/bordeaux.json
@@ -1,14 +1,14 @@
 {
-  "longitude": null,
-  "user_support_contact": null,
-  "latitude": null,
-  "security_contact": null,
-  "web": null,
   "description": "",
-  "sys_admin_contact": null,
+  "email_contact": null,
+  "latitude": null,
   "location": "Bordeaux, France",
+  "longitude": null,
   "name": "Bordeaux",
-  "email_contact": null,
+  "security_contact": null,
+  "sys_admin_contact": null,
   "type": "site",
-  "uid": "bordeaux"
+  "uid": "bordeaux",
+  "user_support_contact": null,
+  "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/bordemer.json b/data/grid5000/sites/bordeaux/clusters/bordemer/bordemer.json
index 880d3be689275e9f9ed0942317a741c04620b148..f256fbf05757e32fd86785381b3335a98aa07306 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/bordemer.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/bordemer.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
-  "model": "IBM eServer 325",
   "date_of_arrival": null,
-  "uid": "bordemer",
-  "misc": "Motherboard Bios Version 1.33;IPMI version 1.5: Firware version 1.46"
+  "misc": "Motherboard Bios Version 1.33;IPMI version 1.5: Firware version 1.46",
+  "model": "IBM eServer 325",
+  "type": "cluster",
+  "uid": "bordemer"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-1.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-1.json
index 8b8242cd11cecb486f9cf55af34e4c3d56ddb5d5..88897c555461f640ced3ffd4259fbfac11440ec9 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-1.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-1",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-10.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-10.json
index 2ddf33f2beaeddef2e31c35287f925c821117d39..ba60b8049b8f6ddd2cc732c349fb258f8a137ae1 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-10.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-10",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-11.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-11.json
index 93774fae3295e7cc54ddb8f3dd8ccaff18b024e0..a51eea6a68db33b073b2857e8a3d9df182033fc5 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-11.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-11",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-12.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-12.json
index ff9f1c97798259536a073cf7add444a3aedc1c5b..129a7749f6daa2e36ca3e6f1389ed99b2de4798f 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-12.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-12",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-13.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-13.json
index 98680edc0035c609427cd81c5b963dbe009215a2..2d17660a2837ac98c82a11cdc6cba84c74d6d231 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-13.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-13",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-14.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-14.json
index 6e521ccf2c6d53bc2f991a288089979a45b1893f..d928e0718459d4119136b7fe534a3ea9cb99fdaa 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-14.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-14",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-15.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-15.json
index f9a67bafe73f3410a8c94da2992ef30938ddae10..1153cae16e6763ab9ee4ab1f3c71c562336d1590 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-15.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-15",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-16.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-16.json
index 9144476ca17b6dae41220db54f04473f52b67873..62906119599469e48694b65e987ebd45af2dc756 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-16.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-16",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-17.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-17.json
index d4ee7693a19954c56383f45bc914b443e1e07081..a078400e997ab4bd50b24195b11281c33e0d709f 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-17.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-17",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-18.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-18.json
index 03368f2ec3c780ce462902b6c947b88bfc31ff26..8fb56a713dc3ae5fb5b3f596c9d78055ad6dd4bd 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-18.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-18",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-19.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-19.json
index b7570f22e0e178c683ccf715d5dfa5b5d495399c..196724db97adfb55d01fddddc39d744bb783f28e 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-19.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-19",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-2.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-2.json
index 88ba552a310095721139470fbe9509aba373f6d8..cd32bbe528ad7e351b45f5971d8182585ea0f8d7 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-2.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-2",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-20.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-20.json
index 0e7122ac3c2b6e07f56abcc639b042bc5f43ca1b..288f73b3a7e2e7074f1519994fff2428fb32b214 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-20.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-20",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-21.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-21.json
index f2b3d7d4ae8ec7efe4b67f66b8848730dec4774e..d2386a887fa54ab29982a8bed81c4826c9f07df5 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-21.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-21",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-22.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-22.json
index e3056847bcd675e31d1fb824bc362a723ba4cf07..56b22186f3d1172d3d2eb715a9cf553bd1499c5e 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-22.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-22",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-23.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-23.json
index a8e5b83faf580332d4d42e59867cc3a8c8ebb698..e13f09291f97b27686f9e1a4bd7ddd54c8ce7a26 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-23.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-23",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-24.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-24.json
index 6bc1fd8fad402fa57ab9a11c36c5ee48df380e97..1272d637612c9c706c2a425d6befa864848a2a81 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-24.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-24",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-25.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-25.json
index df25390dd9446b7fe0c816c86e5da17d5b9228aa..dcb19ac3ad5392fc98df6548ce171eba1f4de2ca 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-25.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-25",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-26.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-26.json
index c471c9f27009211a81fbf789136defb2f90af40a..ed4e4916bc037739d69a8756a896d0219b2e7dd6 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-26.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-26",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-27.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-27.json
index af780e8007f2b22ef2817c924c3c49f9ca60c0ee..04a4f2f5aa4133fa9ede5224558d99bb86ff5d80 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-27.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-27",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-28.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-28.json
index 54f425618be591fa03247ab145836c7ad5d95dae..a532e1f52908deab65bb4a8738c15774db566560 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-28.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-28",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-29.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-29.json
index 66e483e6c30783944b76ad10e2562d7381089d4e..5e76846b345f372955d0df0b750f20124a70f567 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-29.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-29",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-3.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-3.json
index 276d12d99806dd1857a0dce853a9c750e04f06b7..adb7c1d51b49669314cd840b9593403277a8ca1c 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-3.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-3",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-30.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-30.json
index a8884a5332482ebe61eae6a4a62fda4088f12240..f4ce6a44e29ed4e0dc7edc15eefe0d11654cf76b 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-30.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-30",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-31.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-31.json
index 5a401e8459ed431f80f22f1b23502b1b7b4eb174..1877b587dc7fd8539e951bdf16460403445c2914 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-31.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-31",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-32.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-32.json
index fab247be2e4643184ee487462f24c06e6a4ad7d8..11aca8d40fcaa2a317f16886dc426c5a24ed575b 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-32.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-32",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-33.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-33.json
index c5bed0f02af2f945a63078227468c26a9292d23d..230c611d958ac7f9692733333c6119a89bbbf585 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-33.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-33",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-34.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-34.json
index 2f1a1669a8d5921a6526e51f91618e98adc7c557..79b9f735eece56a3cba33f1666f996283b70591e 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-34.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-34",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-35.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-35.json
index 8007ee5eff29967eb014d1b8b6c5ffc14990f745..359c02898c434c27ad947ddced35fe1457adf033 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-35.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-35",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-36.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-36.json
index a9f60cce3919bdfb8518193880b48f22e39b40b3..05e06f1795b27c48a7742c0f34b0631153f907ec 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-36.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-36",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-37.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-37.json
index 5da55fc26c1514c069d89ddd37178ffdce4eb0a4..c03fe6547b34173d6fb06c9a680e1964e81f16b0 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-37.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-37",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-38.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-38.json
index 704f5d7580b8ab69295212466b0b39d29082be51..49d9a0a6feeb0aa404bbb9b96eca5a7ffc6a7f1e 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-38.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-38",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-39.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-39.json
index ca82b0ee7a12b6d0d3fba684a59390ffb3912912..1a4bd5f0e592bf2cf7ff98d13effa3694cb89a45 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-39.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-39",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-4.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-4.json
index 3f415dde167481ce376a9522f33eced0e448f621..2a6f6a4044649f088d4d018e3ff090f278e0e0db 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-4.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-4",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-40.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-40.json
index 1a9588a35c547ad5e632291efcd26c996382922f..4807d403efba00555052023b72ce51b8dd826cea 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-40.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-40",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-41.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-41.json
index c9c1378bf80f529f313c45c30eeaa2f6a208ca75..c35a9bc20ca47ab0c73943415f9aeda4cea6e88c 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-41.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-41",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-42.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-42.json
index 7777285cabd63aa271d65244ffb7054f1340728b..4d0bec4f56da60ad264c38a439a844146d40a4b2 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-42.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-42",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-43.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-43.json
index 2b682f583e7162a67b75a7efee71cabeff674496..0b553d4ea677d934a8f9bf4a854adb4b4de97f44 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-43.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-43",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-44.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-44.json
index 8b2de57ad39ba57e4eda24114823c98903176e76..20948bbf3df3b6f1557283bd5bdf307481fed115 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-44.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-44",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-45.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-45.json
index 6001ae5691193e38f93282c9e2b68af847fac13d..ad673744fdb7f487f9fd10ef2f2aeca607ac45ff 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-45.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-45",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-46.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-46.json
index 85c5486559431f046ff3fa9bf981fcfeb77c21e9..b411e72175326a462867ecb0ab874e3b369dd504 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-46.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-46",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-47.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-47.json
index 9d7692938600bf08c984424df80368cadd75ee8f..570febe49290d84bebd38ccbcdeed6453ebab046 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-47.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-47",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-48.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-48.json
index d015b0f4ca22f337cfbaf6ced8e4065235c31d27..849da4e3b44cc97ec328b8da7949842f702021ab 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-48.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-48",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-5.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-5.json
index 5fb0ff1a30e1492485f7459dfbd391373ea8c4d0..0b4bf2bf88edb44a952c3284da0ee494e5f08521 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-5.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-5",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-6.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-6.json
index 59f1e42847db0cbe94f04553dd56badefe7eb651..67f937f4ac22315f0d617a4a3cc522352239014b 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-6.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-6",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-7.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-7.json
index d6937a0e16ce7720043238faf97ca088b51da290..9259e9fad1df8bd6792dc52f59fa7cc9442bca35 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-7.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-7",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-8.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-8.json
index 525608cde17f1abc5096568cea9e10f77ae51fbc..af78e22ecd90fb501f106c01b64cc70e1bdbf5f3 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-8.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-8",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-9.json b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-9.json
index 70a5eccd58ef51e88d730a56e199002fa2817704..9b018a6e274a3afa5d00d3b69048e7032d409dfc 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-9.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "bordemer-9",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordemer-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
index a70fea2d3d0600c0a530d5e5b0c037524d926ec9..cc7ef3ee1a83b50ac473706afbc154065e0db3b0 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
-  "model": "Dell PowerEdge 1855",
   "date_of_arrival": null,
-  "uid": "bordeplage",
-  "misc": "Motherboard Bios version: A03 (05\/12\/2005);IPMI version 1.5: Firware revision 1.6"
+  "misc": "Motherboard Bios version: A03 (05\/12\/2005);IPMI version 1.5: Firware revision 1.6",
+  "model": "Dell PowerEdge 1855",
+  "type": "cluster",
+  "uid": "bordeplage"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
index 792e1632147d4c814d8c84b5f0f9fa6569af6598..eaf12016a34d5f3a0d200472d573851b682c4464 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-1",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
index cf621b8378611a7a5880a6cdcfbf6ead2c4c60ed..4916e5593c2a393174625cbcab1a2674c3bb8083 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-10",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
index ff61cd2e990dc7bde483f7464010c6768fc1e74e..706a8895b78140b85fa092cd33625411d2ef21db 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-11",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
index d289857df355e6b93a97bba2ba1fedcbe13c1b0e..3268b30cf08a7a574dee0e4b888ba287c0cae9fb 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-12",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
index ae25f2cda798185f5a0de507d5930c4098ebaf9e..82ce5336eb79afebdaebb2d4cc2e97374dd79e06 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-13",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
index 9ab7e0cd0062082407a85a62b71917a382e5f798..924c4235606a18ad1280eee59243e0358703f8b7 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-14",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
index 43d3f4848b1c087fdacb0627c6de90255de32ac8..03198b24c78c2914da724be2a645cc5b11e86754 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-15",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
index 802c9605dc5055e0d5eb2b3d7fc5d784941039f5..61caa71636cce54e100bb5848ab2b6c40b7d3778 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-16",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
index a0401615d1a668a200e3f0bdb76efcbc315e7134..1daed78e86694d0e2a2e7d8c91719b9d4e8f13f2 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-17",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
index cdfee79bbfae7fde2d6fb2eb2981a4d37b7bece3..789b37e35adad95b21567041d7fd0e5b7530a26b 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-18",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
index ae1b95f8b856fb1b88b02835d163689113e27181..7340ecca8bef7a7d38ef52aefcc5158b45d719f3 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-19",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
index bad586168cd61a97e28bf979081b8cbfc2c71fb7..e577573c101411627cb54b78fc1f7423e77ee17d 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-2",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
index d6bc972ed1ac97e3640b254c3f7facd1a244e3d4..97d01a450742ad913926796c537252e516cbfec7 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-20",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
index 22ff705f312b3bff0123f6edae0a56523bc49194..b8713f8f3d7f7dc8dc112b9c4f64bf5c92c3c4a1 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-21",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
index a024e51d8415fb36a1c5e1d53aececcc9d80a716..d9c344a6151b5d7fd1d12280b1e6855aff9f1e25 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-22",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
index 45f16c0245b585f78b445be42f5178142b72f476..cc409f69fe202414168bc9e7244ea7fe32f7e50d 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-23",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
index 54fe37e9f7dd9a33a85085c93186285e5e06bc52..7ccff5a700dbaa8d010c4b0f6048e059f13ad91c 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-24",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
index af991df93197eaf388702a5e9b2391604234ca57..da54ee6a80cd87a3b149a91b53e11fa0f9f0c39d 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-25",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
index 15e257d654d30b2dad6b37427e485c9abc6cf0b2..4be6c0e6ac5cdb89b665ee4e5471fe2a34cdf331 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-26",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
index 76154f36c89a36d3096004952b2b3b1b42efe793..46157af20de9a0592ee8a52ffb4ad2de242e573c 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-27",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
index 747b486f6506ad48443428e6c09f1b08d0d9333a..2ce85612986e2caf2d87457dc6a51f52371d8bf4 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-28",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
index 90758394abc59079ceebb54f60dc049b8b2b51f6..1747762e8f530b1e2dad0a501a41beefc068b942 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-29",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
index 41bfe4f497ba01e01be2b1fd913b7ce820084cae..efdf1140aa3876075666f76b89a6adc95c868476 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-3",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
index 627022805613751ac44b0e88e85f3598a1d71d26..c53fbd186b12aeee6aa28f9a59fbb9c96f66abf0 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-30",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
index 0b28eefaa6e062b6c22bc1856cae65222f1da599..318e4b02b044a10eebf71fc13f4b183d7371080a 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-31",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
index 33ba94a0c58abf1e9640e8b8ff6a2c0bdf693dbf..72d90cfeea88dd5c493027c9373aa746b40884ec 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-32",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
index b6b3ad2ab123a34f744eacf322eaa5a2c43aad73..83de6e0c16206790c98ee2cf061680607c9a1ea1 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-33",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
index 36216d35a230ebd66db1184d2e3b079ec0be96ec..7a567929538f62e044628a7a60f6ed6fd28b9b40 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-34",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
index cba10e2023efbfd56c9f9511931645e2130895a9..327ab7f3d09ab2e80aabded6b05c84e506c5c2ba 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-35",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
index 5073c28edb78b6833ed934f8a5f30d11970ca515..c40008b4364d8dd4648584fe72088b3962595617 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-36",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
index 4ecd6a5e8b08ecb7000d8c622c3aa8d2af857634..5be0a25f06bb341b24de43c243955e7396ae94fe 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-37",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
index 1cee92d0b43f1cfb463380a3448b2963c6141856..9fed8585c782c573b7f1e7046479bd50dde245c0 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-38",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
index 318920f8ce50faede763dcdd154c3a8019d832f5..607f30c803e53ea6d2259cc5a201fcb24e03f15c 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-39",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
index 00e9e932bb60f762b6dc817a257064be9a3ce865..56b4ab2cddad9845b17025bcbee223b00fa09c32 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-4",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
index 22ca647fbb2556c18869ef2a718fb1f32c8aa576..3b27151e5d3602521dcab66719a6c3d4a0ffc336 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-40",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
index cb3ed2cf39490b19c038b8a5d408f216fc5a725c..c4abf8f0bba59bcfc38cd32652a10bfac281a1bc 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-41",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
index 0e46f6ab84406779ae0520bc2a58753c8aecbbe2..b1bbc8aefb199d30796f3894de05154b97a1bbb6 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-42",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
index 25f8cdac9bd572d4340609b6803784cd98a0d2c6..851ab28bb5161cb0e21239bb0f1f21c2e54cc0cc 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-43",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
index 4786e159d7102ac5ad4dbb6e58791938779bc251..0093c9008d40772b584b69f68a32cd429c0f8cbe 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-44",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
index 9008ce71a2bbed2dc2177c6d82e550b1beee05fe..dd72ad84d4ad36a6443235d80a3645c748140bf4 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-45",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
index 08b3ba5e186f1343bcba4a247a0488a33eded506..0a4f3015f7a47412b06ed8a511e0f6ca2c064c3e 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-46",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
index a8828d42c9795c12278264b407db62a1107b27cd..463131994156c37c4201d858e3a3d96c80198c4b 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-47",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
index 0c62cffef39417f33ca55bb09cc2a2927b7142fd..d65986204b093f6c69744dc5cfbc6109f3b6af5f 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-48",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
index d6550a10e86d98fba7150bbbd66743d156b27d41..134062ff4cc7173fa1f037ff24c152291684143c 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-49",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
index a249d88ebed386e9ddf2c41d919f427b466f6091..750839c49f1f5511280358cc223acc9a05d194cf 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-5",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
index f57b6332f9f87b8296201e4f68afa78c6a3fb5b3..2f3e196b1c32958602c1f1912e5dcd92b439d9a0 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-50",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
index d1f03aada3893d038bc596c9accc1ec0d23b9c92..7278ea19b3379b6a11f65846cb0f1cf1e0529e95 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-51",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
index 8e4ff39adbe47de36ef1b1cecfcbff5652fda64f..5876cdff68c7337c4fe5f0afc1c5f6fc65885373 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-6",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
index de8ba9963a2dc0c2af1241301e3b884a423febce..dad58d311cd6a2f8d09517d26df000dbb6bae776 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-7",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
index 9b37a273ba9aac91b5a65ea258413345bcc7b8ae..4068b44442e3aa6c5cb23bc2214f8341c8931d3a 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-8",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
index 138cd03ca9f954390467b2c134357839f1b7fd04..c0b7cac24a946f119616b412dae5bc580683222a 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
@@ -1,58 +1,58 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "EM64T",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 3000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 65192580223.0835
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25208",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25208"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 3000000000,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "EM64T"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 65192580223.0835
+    }
+  ],
   "type": "node",
-  "uid": "bordeplage-9",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordeplage-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json b/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
index cdb5e28cad23fbe2a4e3d02e2de8716184d76287..a903326f71b5be868c260c45adc226d1fdb9c440 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
-  "model": "IBM System x3455",
   "date_of_arrival": 1191240000,
-  "uid": "bordereau",
-  "misc": "IPMI 2.0"
+  "misc": "IPMI 2.0",
+  "model": "IBM System x3455",
+  "type": "cluster",
+  "uid": "bordereau"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
index 29787c127a6d3bcf3754bf812af45cc6ed02a6f0..da67ce8f0e172ff329c56db43e37939b3ce8daa9 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-1",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
index 569108a4ba3b01f72f0169140efdaabbea66b02e..3ca62ffbe04d360e042535b9fe4c01bd3748196c 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-10",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
index 3e9949579bd89ed788a38554bde6668d923be8e9..cacd34e4c0c5ce9a19fd574ad992cefda7fac902 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-11",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
index 7ae87d9d92780ee0983f33756437a9bed3c892d9..137e116368c551f9e76e966b18db6e4a3ab0c053 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-12",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
index 747e7822ef829dc8f233dc2f26415356f3f9c351..622ca37c0001c87495908b80e3e2e47c9f76bd52 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-13",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
index 32cdb30935a2cff649baf1054ebe52306ca6c0ca..294c06daead0a02b208ad61890665221812bbe36 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-14",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
index 5ee4aef60d410553865a33e0c36848668392fdc3..d1fce1a3f4c6243c4888b403bd1334d609c8372d 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-15",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
index 83ceb98bacc346eec8794a2ff31b75f5401019f0..bfc47ffa93251fbb39ba5a3c0d1efedef08b9293 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-16",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
index 19bc0b0a96762303409453db970119f8fd37ac51..a78c64c97ebe48bce02593e7377c4b55f1c10acf 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-17",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
index bef7469ccd0711e589180eed5fbc9aa19308d6de..76432667f660a87f1fa4505935f8de19151452dc 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-18",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
index c7c37055ae62277cc7e9f6f2743810e2fecbc8df..df8b88cb9918bf1835fbad29f04b5fa7214b9da6 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-19",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
index 87b63f3289df28e3ffe4343ff6b0ee6f2e854a92..4690aae57ded9906f50f7ed1d4e67ed1d96f8054 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-2",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
index 4072e581e3c7f1ff4607332f0e01523fe63e8632..0fd891e32242d500824773f875e0d7ead9dec39d 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-20",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
index d9a60fd07a9c79943b2c055419a57db41656982d..696bc224e29e0759a51959ad7777ce869e1efcdb 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-21",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
index 26cf1fea0488476c624edc5efbeef4f123552225..4fe9945fab715b05eeaed1c036bd9a3a7e2e324d 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-22",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
index 61d20196c93c49c0010b475d83b2e42228129958..80933aa39755c4c29869f0cbf4aa579ef33c1092 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-23",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
index cfd3f7c75b5e5275200da11f6fa2fcaaac277786..f7ac3b701c1ed05d5e1c1cf146349406c2780ea4 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-24",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
index 4e1d8a7e9ae20f088fc72ec5a6200c7ad199e118..f1d1ebfada9c6b4b6f32de997439b296ac333534 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-25",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
index a8c992ef1e6d432d5741622eae7377831309fc59..0813062b16d1f518e08c694b40a1b22f5e36dcfb 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-26",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
index 0d8f21d009dede06159599e176ea64c670dd18d3..2ba9e53d13135f37ab19a32b50a9f0edf722a526 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-27",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
index 19952c66b6a1d244000f73c83d51ce65144892c0..4acbcf83d51769cb5fd4a1826fb9b12d718f135d 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-28",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
index 963c1a07a8055e84e6b38f66642977efaf3caad1..d45e28f60c85a173d1389ef667380855efcc0bef 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-29",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
index 9b2d3519057dce0007f9787b69442f105584995e..25570541d8b7aa6d888cfeb19a1832b8ad01cabb 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-3",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
index 3a742dc1a15488814c78df4f03b1ac9363ad37f0..e121e15228a534846a4208ba1c9a122a13e396c9 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-30",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
index 9e9489e12c370744af4715c337888ce284343cfa..bb093217849dc8a443696c6c780dfa68449ecdc7 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-31",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
index f1c44e61f7fa4a4ae37bf5a0c4acd2cf1780e5f3..4ea3522ac9097aeb11f3f10990577d060089fca7 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-32",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
index 99991d50def8f91b56e50cb99befa2523adca026..c7ad80c0331b7565062e173805d5ec84f03b2b7d 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-33",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
index ad9b9ac7b8ef7585245ba8f09b20b60777b99a9c..2355f533bf4198119e49cc5b51a4128fc45839c7 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-34",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
index 5fa0c599aeb5be45ead10b9791fffb41e420efbf..b4845213beacb81594b6d2ae8adbc03080b60da1 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-35",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
index df8938ab34cd2856291693a34ad56fde302cbed4..8b5a4089e0953ed453e086046b7dc8665d8cc55b 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-36",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
index 9d57d6c85ebadbbd4a9769a4ab87943c729abbc1..85c81fec841de5fc86d777ea00076004e78ace8f 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-37",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
index 2cb3ffb4fbc05f00ffd300e6e2dcdd835689a069..f2d375e38f7865ec0942cbc46ce934ecefcadf2c 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-38",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
index 62f99d614d04ef23fd62210757be42af4ff43d11..7b3d69905484544e0fee8d031c3aa26157f6262f 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-39",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
index 8357e5e1a7fecc8382ef18e40a5088730fa63a35..b03b8a6ad6d26d4d98e2bbc8555d72cf38bfe7a4 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-4",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
index a9f5d2c12afe1f4c4a245bddba2000ce63dd66c0..d333f8da0c3805a72b3186af6039159485442f26 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-40",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
index ed392fa59ab29750ecb2e7279a028395803e76af..7fb98ac052dbf959399145808f36dca556c14583 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-41",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
index ab1b775a8d2a19aabae53d634f6f5b9983a059e2..a4c17e6d552180df8ea9a2d4722218d3089e9773 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-42",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
index 42c4d18bdccac36517f2fb0fc5027b4cd1afe863..f2a44f6b09cc9614490a84fcd67faf106d11f654 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-43",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
index 45ff2327e40bd5f8faa520c30d06535113bb1471..7201f0703de5e7f71475e53198bfdcc6e78b268c 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-44",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
index 0064b6840bcffa527c845e82c3cd89b5d54b35fc..b6047029b68df3c4a2ec0c8fb18bef19c0b0d193 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-45",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
index e4cc14af7d01354c369228659869ebb0ecfa62fc..7b65cc154623cc7c4b330e1274f5ce670920e2f9 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-46",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
index eb6e656bb21b7dcbbe30fbbf74731ba82e5295e5..6eeff19c571816e51b81eb3ca65b9065a830c7b1 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-47",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
index 1e1b3c23c6e93dba32d9449725190c3684ce2677..6e1264a787859278051444dcd80a369ad519654b 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-48",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
index 515dd5ec2a8449d26b99afae63e1816a7c3dbf4c..fa81415a523ebb646b4b3c0f20a236553ce2e3e1 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-49",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
index 61fec644878e75ddb3a6fe9507a2bc4691b74906..7412c922f5a2bcbb25a09af6b702836498a3fe2e 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-5",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
index fa764cf139f6d587f63e2d7a25e6964fca5df356..a3652b0f48e5ffdd3e3c40d8a0f3a94e40d9a5db 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-50",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
index 1178025d0ce266466192039994ca940b4f095265..e7258e50c308c74a15fcc8a5a8d7f8ec92f56aa4 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-51",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
index 729dbf92e8358b86cdc1ed4573bde1a37f486982..5dadceeaad7dfbb513bedbd6ec84f3d1ba978799 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-52",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
index 5a91d9ff846e614a1aebe1035b6b8af76c14684e..1c622c74b18b0ddb4c47eea38bb8ac98e0d2d315 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-53",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
index b7de79d101aa456a4fe72a57e5c8a5038e820efd..2a11019045b655369be905fa0118bf625eb161c5 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-54",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
index b365729e94ea446c68175571fcc1a3a1d3d163cb..93b2cbd7f14cad925e928ccabd4cc63a808b7146 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-55",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
index 0e13130fe48148a4d7113de4a6df93c424c6c483..1b037417c8ea8b1580bcfe72831f776d3ddd5e4b 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-56",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
index 49cdee34045fb4b3a1031ca4f48100ec26d035f5..d701290dcef30de0195416dae82ecdb0c45a8631 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-57",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
index 99a2005d313dea99e0eaeb42e3a44b368a0592d7..a4d67f996439ae86e50ce6addc5fa85b9b88d984 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-58",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
index 5523469d12df733635874b6231004acb8622eccc..69f930702b026d0c5c7624a042b66a22dd792065 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-59",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
index 05a9958dcb21b9bf867305e1b1140c8cd704fcae..1a0f3827ea236d516d43174b572e7e88c05eb0af 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-6",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
index d65e537f2f789cb8ff3700994f0c203043c37a06..4502d74b01d54e4a6ccdc1b586058fe6b2a61fc3 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-60",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
index 5f64d4575308772ab13fc3630833fad95aa4ccd8..a8467c48d2fe9ffcf664a49c463679cce12e33cd 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-61",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
index 8ce1ad2204e29fa871a2a486ffc2ae73103a3e50..e3ed8317c904dbde39f4cf8d201adce00f39545a 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-62",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
index e017e50f6639851466c140d061b0f68cf3e800d7..a1d9a090317820a6713ed823fd19be9637f464b8 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-63",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
index 790e762ac1d4bdbb498f806664256ce384c3377a..24554c5db1a7b87cd8580454d507ee7095cc6220 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-64",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
index 4f814fa37c818ad960c328b1aed3f3aef8dc1b2f..b5cd6da174adcd106c03fea385317563e3b5a121 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-65",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
index ee3d2ab080b8b63a28631f082d8c7a5d57ea834b..2aa8ce467a056b5ccbb9dd8009065e4c0875dada 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-66",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
index 9ba1cb674517577d1e74f4bbc1496de012d850d8..61d63e0fcc72d1e61d939d3e14756ad8525342ed 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-67",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
index bc19738c2478008b0e9e2bfd9b36072206f96d04..0cf8ffd4d524eb449bebfa4fa014b7712266735a 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-68",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
index 807a92bc4735e62a285d54912275ce12955e935f..ac6e47006ba298f0b573bc4b0e1cac79ef798835 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-69",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
index a981d891195d0ca8d0c752b9ffcf1b9d0c988ecf..1d1b73cb936e70fc70f64d3a3a1fb736c4487b59 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-7",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
index 193e06a1a59961253114b13c72e8e02ab245ccd7..55c5c99964a063276e6e6e439acd8a0774f495bc 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-70",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
index aa7e047e90d411d1469061b4ab38cbeba027b103..4157b195de5833c2234e73481baa18802b3175ff 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-71",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
index 1252f256bdb72e1c79044b0b03316bbd890e92f9..9d4a5064486eb0c710c7f94c959328148eb9731e 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-72",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
index 697bafab9ea7d93204c341db95eef25380a74971..49008675d14acd15e124d00730ef38cb253a1fa4 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-73",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
index 7ad7f747f0bb31f9805e072abbf048b942a5f46a..24c0dbcf4349c10a80a653e6954508f3d2438ccf 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-74",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
index 37aa87e449ee597d84c6193f2957568a75e3c5cf..4e9576f64c1b47ce252bfd0d5a9325e15f7d73bd 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-75",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
index 0b2eff9409f170cad3a46659960c044cb3877834..8594b0840772fbd0a493a4165e55aa1cc5f57471 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-76",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
index eb49356a8a4a754799c0a7899e1791ff0962576b..53661a1d6671f28582309c74378ea4292130d02b 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-77",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
index f6bfe279afcf32503a578851d41608a7d92460c3..e6ee9724927b7ad8a45e3631a641ee938a2bd8b9 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-78",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
index ac385d677a4b9e8e2690bebbd54b0e372804c148..60858ddf9aee5d121d9b4ae7495e8ada7d24fa1a 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-79",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
index 9404c34e11b9e08223d65758387d0a557be3898a..6b72aaf5f638544fab037bac501b19129211be75 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-8",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
index 7d3165c4766a2e5d87ec4dca73e8d78be3cc6020..59496ad362cb7cced66e83607f98f3c069ec88f3 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-80",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-80"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
index 77f5db797ce44d2b13aa0de3333d0fb31c19a04c..b1307e86c98fc1edcc9487fcc5bb41905c5af131 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-81",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-81"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
index 157c1d0c13b250803ac31ffac65fc23f2df4f3b6..77c932025dd0e9d9bc090736ef75c9247fd09de7 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-82",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-82"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
index 22674f996c3b0b580cb8c982aa973e8a2d16e1aa..143cfa485b8e12c4807f00d488eff1fee7af6afc 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-83",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-83"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
index e1e9f83bde9487983f7e63b86dfa9203f0e7bbb8..90f61ccf480bf5f9e6af65d4127f8381de2e9b66 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-84",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-84"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
index cc1a33533e42b8a5ddc7e071e334a4a69bfa6405..c1ee8c20e5592954fb5a20b8986998f65a2bf88a 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-85",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-85"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
index f627306dc5e246a8c22010ad6d34f73e32c9dff2..e7ca673180e2880c1be75d640e4a5c4e7d776edb 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-86",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-86"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
index 88f7ec1b5360b0aabe3f786e5b6f62ba8dca89c5..db2699444fb08a3a4e3b3c024e53cb004d88a1ed 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-87",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-87"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
index cca2b1f1fc096f8036abb1ffb6ec21a5ea4ad7cb..a9d4760d78567204090c0630c2e3a6fc4d5e8bf7 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-88",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-88"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
index 89f3d9d7ec8fc85414234f02af9a38ab6bfbc197..dc9d737d595b4429e3480968e0f11eb61cd117c8 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-89",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-89"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
index fd1051fb86bbe4aeed04e133910ad650545acd18..fddfe30ada6b943b1d1740f91bbd93c694f71f6e 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-9",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
index bbce044673c05ab0695a459660a7483eaa017035..0af2cf09e55d53f8b87312b52301a20aa929eb04 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-90",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-90"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
index 5ad67ac35c3a03100ae6d8b6e281c75fa9ee3adc..8826d7645a87f0c0c3d24631081b2054ca5c2fbf 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-91",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-91"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
index cca0e8cd232da1640dc9911049019292e568bef1..4e6151c2e3f82b35cb18b52818413cf7bb28fd97 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-92",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-92"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
index 97c71082895806b950537364d98581fe68275687..b6247a649715d1a3cd8108cdb87498803d5c6ef2 100644
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
@@ -1,57 +1,57 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "version": "HDS72168",
-      "vendor": "Hitachi",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "version": "BCM5704",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5704"
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383,
+      "vendor": "Hitachi",
+      "version": "HDS72168"
+    }
+  ],
   "type": "node",
-  "uid": "bordereau-93",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "bordereau-93"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json b/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json
index ac276278e1b303b8afcdcbff9d2ec3ecc4bc3d79..a7693daa53ca84221c446ee23711a3bb8ef22233 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/borderline.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
-  "model": "IBM System x3755",
   "date_of_arrival": 1191240000,
-  "uid": "borderline",
-  "misc": "IPMI 2.0"
+  "misc": "IPMI 2.0",
+  "model": "IBM System x3755",
+  "type": "cluster",
+  "uid": "borderline"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
index dd6561fad4ea5e388d20e57a15d5670b7751a701..98acaf666118e38d29f9ed0a5fb1576948d9b351 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-1",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
index 9c3c2585c8fe74e180c93bc4e7b694e4c5da8848..9d01ed8d1c40f3b27bb21a4edeb73c0f11ca5f04 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-10",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
index 2065462d647b36d5ef24fbab1f3007aaa28a1bd1..2f1065d7b833d7c1aca9a536e624ce61d6367fb9 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-2",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
index fc9b9f82ad6731eca10fde3b3a102ecdd657757b..0626e3274b8df9b323cdbeb132067c23c4cdad34 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-3",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
index d2b34b66e19928031c245cf97adee6fc1b69792f..0cf676d1ddc6a971b69eb34253bb15c9202ef88b 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-4",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
index eeba5caf44395be12f2d4d656f66d6d028b97309..a7e9c89efa977e95a0bdef10b731fd8660bddcfc 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-5",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
index 6f8c3fb5a5c1b3ce56c974d1cb9b2190516604ea..057af0f4fe0460d1725c25545f3bee13c0331f75 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-6",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
index af5c525a8b05d95030ba45d55ab3a210067113c2..6da1741169e2062e4079196feb67f57d756dc805 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-7",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
index 22522291e12dd0295c0953d0d68ff7a74a60b2f3..b2b9d462f447d3417171e4d80afdab5f1f2411ac 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-8",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
index d31c4d76c93b68930eae7e479a93aaeba8c22e18..a806bd52936b70ced2a4196ab4aed9778fa4fb4c 100644
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -1,65 +1,65 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "2218",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": 2097152
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 4,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SAS",
-      "driver": null,
-      "size": 558793544769.287
-    }
-  ],
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
+      "enabled": true,
       "interface": "InfiniBand",
-      "version": "MT25408",
-      "vendor": "InfiniHost",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "InfiniHost",
+      "version": "MT25408"
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": false
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 2097152,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SAS",
+      "size": 558793544769.287
+    }
+  ],
   "type": "node",
-  "uid": "borderline-9",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 4
-  }
+  "uid": "borderline-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json b/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/genepi.json b/data/grid5000/sites/grenoble/clusters/genepi/genepi.json
index eaf30dc7c91eb2421d4654456457f149c3da4217..3060e4c3de9746baab783362aa882157dd570075 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/genepi.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/genepi.json
@@ -1,6 +1,6 @@
 {
+  "date_of_arrival": 1222812000,
   "model": "Bull R422-E1",
   "type": "cluster",
-  "date_of_arrival": 1222812000,
   "uid": "genepi"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
index 8b9d938a8f29f6f31897834a817d62b805e93607..d512d8576177c76c401cc491296f279ec3a739df 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-1",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
index f700f39eeaa40a87f78ecf4bda202554422f8f3e..3bd18d00eec30352b410092858065706f4143973 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-10",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
index d13d323db7195e70a32a87df06aa2501fee5976e..e7735ac4e7326e5675b3ca41de4d1c8167fd520b 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-11",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
index 0896203407af9088518d34cbece562180bfb73cb..78d90824576d6d7b3aef3555c3e26061ac1d6096 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-12",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
index 030bf2d592d252598beac8daf2f3e1fd397c3d6a..5e49953ad683f8b57a8d738a7cc0077ea07d634c 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-13",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
index ca86963cf23c14a3ea8b3128e79710655d1c641d..ab38d3c6022bf9f02c2e8b3c5da513784f166fab 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-14",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
index 4bbf3e5adfb54d27a3f9bf38ccf89ba0100eae56..9f01885b1a7da68a5cb1ecb80005175d80515baf 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-15",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
index ce18c5496e579d55040d9aaf482f7209510067c0..591abf6dbf23541ab28f4cf20a5a361d07f356dc 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-16",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
index 4eb3d14b0a20e92f3a1d4dc2234e62c3f40ca5f1..4289b9d5552906276990c1e6475af9e8be97ba01 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-17",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
index e59af5e2cf6677e37d6d0522973263abb9a4e0f3..ee22484330af9e2da809f48134ef6553bf190bd7 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-18",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
index 8cfc3d32e8e2f43f5d68eb15bf03ba3ad0f16e5a..957e480acc53f01d6409df54c996008c205d5247 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-19",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
index 9467664604ba33f371a659bfd73ba9455762a1a1..bef04524199cef3251e3a51c2a7d9ce07abef2c0 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-2",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
index c08133f34a772137e05b047538ca3e2aee6cf8c8..ebfbb0541c3d1d323917538a133edc5862549331 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-20",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
index 49d09dacc4e70fdb3b77725192af868559fe7ad3..b1a415f71d6f567ec3da1287eabc475c1cc74485 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-21",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
index 87f6bb3307eef9b096db493007d59b284744000c..62074544884f5ed248c82290884480c965c9c2f2 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-22",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
index feed85462205a60a5b5ffff89c7ec1a8a70f9a79..5116d33fddba18a1a4013901090764eefaaa0eb0 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-23",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
index 83b3c59cc7bea70253d6999a11076a552e2e6eee..eee8bd9797839c363e575750256052ce86de64a2 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-24",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
index b82a679f11896d507be4a3e6387646a03dc35242..5dcd8798dbfa6bd0b16977929f83e1372f9cf53a 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-25",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
index 98e80735084e06359ae0eb571102113158f8cb33..4f8bc5f224c02a85ffba4b4f5f9a8e21f87461da 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-26",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
index 5a914fd16d751155404bb94136050ac36c31e7b5..577693ccd2559a89322e1c4342ce4e4d741a4692 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-27",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
index bb400a3267167a84cf9d47f851bc00cfd7f17036..4e460be890345201d868b05ed602ef7cc832a286 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-28",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
index 131f72ca8fe942ff1c75e975b1349ce9b37b636e..7d01162c9732e6b7b08e3d3fdf9c6d4fc3d91c70 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-29",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
index cd45462dd70f4aa16f3cb82a9c053a1c99fbc198..315516ceb8bccefcdada56b6634de82b07adb20b 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-3",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
index d21cf4bce2869993fc27bf3ff22ef47259dd2678..87c559331d0a9118f21bf07a2ee59bd37ef0b8aa 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-30",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
index 62462639b7ac2ba1abfdc53268bfa53a22cbb1b4..bd9550ab3088de586d65ff6061ab821a1ba59e8e 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-31",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
index a0c04f0a973662cd06b4591d70c897de66f5be9b..4337ae2ee1737775d7ffb44d3a334851a5888331 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-32",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
index ce390527a2ad454dad4d7ded73a1f11fd66c3388..7e1c98e5fb054d9eec30fda018af6f004e8df7e5 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-33",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
index 06119de233d5bad4db2b512a00d3f4333d691868..574525438e89b88bd8308e1d2cfdd91b76a17090 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-34",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
index 288be57bd981582d2321538a9809e8df6ed0927e..f78ddbf2a648363872b7e27402cb621f1b83b55d 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-4",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
index e2a2f4674e03983533f0aaeea08be1751c71cd27..4f121c456be8bfeb8675d7786eacfc1a58b57470 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-5",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
index d234fa5b400404ed0bbb0ff23f58e63515bbd548..cee1059c06aa7995dd0bee9784da052e74d8223d 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-6",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
index d6ef4229029f28e9b2b43561911b7ffd845ae216..7fdb0610fe5fa257862130cbf430f58c6287f4b3 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-7",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
index 25b3cdd05c05bb42efec2822e6fd52f30a333511..1dc607a7cd09fee958ac1d27712d0b4ead8ef331 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-8",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
index 709847bfbdddbb486b71bef0ef388ad62ab7e704..caf394ac017ae626692c0c66f554a2be65b1aaa9 100644
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 8,
-    "platform_type": "x86_64"
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2500000000.0,
-    "version": "E5420 QC",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2500000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5420 QC"
   },
   "storage_devices": [
     {
       "driver": null,
-      "size": 149011611938.477,
-      "interface": "SATA"
+      "interface": "SATA",
+      "size": 149011611938.477
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "genepi-9",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "genepi-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json b/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/grenoble.json b/data/grid5000/sites/grenoble/grenoble.json
index 4caaa05a0dbdd8250b7b9f991f96a045b0ad35b1..aebc565bb91b7eb63c971af57d0e88f30ddd336d 100644
--- a/data/grid5000/sites/grenoble/grenoble.json
+++ b/data/grid5000/sites/grenoble/grenoble.json
@@ -1,14 +1,14 @@
 {
+  "description": "",
   "email_contact": null,
-  "longitude": null,
-  "user_support_contact": null,
   "latitude": null,
-  "security_contact": null,
-  "web": null,
-  "description": "",
+  "location": "Grenoble, France",
+  "longitude": null,
   "name": "Grenoble",
+  "security_contact": null,
   "sys_admin_contact": null,
   "type": "site",
   "uid": "grenoble",
-  "location": "Grenoble, France"
+  "user_support_contact": null,
+  "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/chicon.json b/data/grid5000/sites/lille/clusters/chicon/chicon.json
index 481ac3560fe31d3d1f06aff2a81474982a771e90..1d09c3748547c264d5026e901607563d480351cc 100644
--- a/data/grid5000/sites/lille/clusters/chicon/chicon.json
+++ b/data/grid5000/sites/lille/clusters/chicon/chicon.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "model": "IBM eServer 326m",
   "date_of_arrival": null,
+  "model": "IBM eServer 326m",
+  "type": "cluster",
   "uid": "chicon"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
index fb081b638081e94dbe7c4e7f4dddb9c92f1d50af..07d429ce419874080063fd58092351f695bc0046 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-1.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-1",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
index f7c9800c68106a9f8025ff3878f2a551f2471dd5..10b792a75b99d9204aee370d78ce90056974fe46 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-10.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-10",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
index 58ec2bb2f1b25a8e5a8cc63a33417c3db41186bb..a65f1944943eef5b1892e0fc7a0a7ef99adbb546 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-11.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-11",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
index 7184d57c2ee4dafcca71c984de3b860438971303..c747f750ae70813f0a404a54fb97e7b8cda0fde6 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-12.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-12",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
index 4dec7954c2a7fbb927d833ae4001729c9d687038..12fc2a5ef4c6df1ec96df540d9c37caebc4fe51c 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-13.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-13",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
index 21e75166b014c77ac017530fdb914652b2aab0fa..9a3cd47f8042f49fd85c1aaae5f55a8902681222 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-14.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-14",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
index 5b935a847c3f8559c5cbe59f189f36d858b04d8f..f65ab5c8d02bc0c98250a6cc2446836b7e37e42a 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-15.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-15",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
index 49a81357014d7377c5ff7b2690b761e695766efe..cffe14ff39dce5ae576611addcde67d8c9952b10 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-16.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-16",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
index 0323cd515172b148dc09c60ac44a4f0f9dce5762..14ca705bacef37122a11ed6e27dad77c1cb737be 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-17.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-17",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
index 35fa6232c40b9da4a60bac88012500162e0df974..5565951bead85bd1cda4b66501cd8f0d18f6d21e 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-18.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-18",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
index 7f92496dce02cad931fb85084f581e6d2a92443d..5f5c944e28f8f5ff2b13af32ada20ed71b874c25 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-19.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-19",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
index ae14d00d10a4282cee44b5e6112a1a539109e318..3638dadc0d8579b30b2ffcf01cf232c301f6749d 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-2.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-2",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
index c091487ffaf55f25874e1afd44337bf3c8d7c59d..5d93af828d676470da8d891aaa85570d75b05f64 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-20.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-20",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
index 288bae4210bd98baf1b04b9fc3f0cf2d2bbc9363..6eff08c99c414e7dfc8d9671d131704cb3eff5fa 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-21.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-21",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
index 5d53d9e2271bd82949f479518bad5923036405a7..7848686e898852988e54d50d3955a494a57d92df 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-22.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-22",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
index 54c1a4034c640e363ea7b5a54ae6e566e3b53a82..98b74e791e16d501ce62031f0fd57890976ead7e 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-23.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-23",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
index c2a66423bf3581e356ace1876ef33064de9da574..63b53868d19b875eb7610f10d88ceda332371bc5 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-24.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-24",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
index d483fdb7c29f9c450a5c5018dd870085766f31a5..44be289ab1fbde6207f7be481457285b0eaa51ba 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-25.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-25",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
index fce8bd8ee167b84b7924e3513dd63ea64efc23fb..2d6675adfb729edf4b4d7c7e7616985a122fd9ef 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-26.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-26",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
index 41a3b056c860cdd890630344abad36bbe03f477c..fd04240f53713195ee193ce18c40c45f06067c59 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-3.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-3",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
index 4398281e89f277f43fbce3d4c12c15ef9fe30e30..a48a67203302d3c37aa1b14ae17f818357b98ea1 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-4.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-4",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
index c7a2978cef6717f11c3bf16445fc71a5cf962f07..74b2c62f9e3353c317c6d8637fe8892a2f91a6b4 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-5.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-5",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
index ee203f9685539c37ac15091e18761470509099e8..92b9f7d34cc44285532643ee3db391a3e8c10c0d 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-6.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-6",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
index 2a7352eb7c96102e17c4c18b32721155432c791b..27fd039d429b22692f122e3b2a0c38abfe52a61d 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-7.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-7",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
index 0b3097560a2946fa5ed3832cbb6958beef458801..3cdf992843e204070f240eec84407e8fa9763159 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-8.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-8",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
index eab0541e4999a882b94ae3295559c95d89c40520..ddb8231cf227edf9dd41e2ee5f03bfbf5b53058a 100644
--- a/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
+++ b/data/grid5000/sites/lille/clusters/chicon/nodes/chicon-9.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "285",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 4
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "285"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chicon-9",
-  "architecture": {
-    "smt_size": 4,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chicon-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/chinqchint.json b/data/grid5000/sites/lille/clusters/chinqchint/chinqchint.json
index af4c1c22505ff4dd71045b15048d0b4d652a1cae..1a18bef39023d7496d14f21107135604a5f29944 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/chinqchint.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/chinqchint.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "model": "Altix Xe 310",
   "date_of_arrival": null,
+  "model": "Altix Xe 310",
+  "type": "cluster",
   "uid": "chinqchint"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
index bd1c8649b570fd928f144adcc50481e1a3b856f0..72e8a475cd648e6de53322080dc8867e4be22a8f 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-1.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-1",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
index 1b269f7f187dcd73ae08b9e6a0d219f0f8ea0311..c2352bb2f9338cc3615cb7477515df86cc7bbc55 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-10.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-10",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
index c0488eb6ce164744dde6d8c7d463416c071297ab..138011de6d399c003852882ae5d73137b0633d5a 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-11.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-11",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
index ecb5bee574cf00145f6bfb4316162a7c1e5b5d97..3fcc7cadf42eab19cb0bbb9e8a3447605218340e 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-12.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-12",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
index c78246237ce83a667ac314493f38384d76063432..0bac39f538a4abd3ef6f478852b25f4efe83c779 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-13.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-13",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
index b5868ab513fdde7958f21d531b233893c6c1b25c..2ec2be65098401a41a1ff4e5b76b45d795bd6e15 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-14.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-14",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
index 6157b90ad888e14d69e0d368d41e8118d3d83181..717850752d7e42977edce70cc12712f419564acc 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-15.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-15",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
index 75a5f22dec51df01df4cb78293bd8fa61ccf68eb..155563d9cde21a0d96d5fd33abdb136e399cd2c4 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-16.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-16",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
index e60a981ae260a0188caf6a44c0fdaddd2e6ac314..9e966bed136c7194c7e7f17402946404716d9b6d 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-17.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-17",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
index 8a33ff0256616a68ac38fea1f24bd5ed17a49d51..ff0a5145fed8ef484362b0a22378deae6f85ba1c 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-18.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-18",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
index 871bd132b24b68312af3481038dff8de642fa000..ef7aacf87c5a4592474421406606e2863e3569f0 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-19.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-19",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
index 3015eb6d0c328576691df5033541a6b4822c23d7..fbde18b32762afa0f9614a465b1ed72ca5c2034e 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-2.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-2",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
index f2306a859f9cc8dfc6e28457305085e0c4d1e776..0c04b007562d5aef4a792249eb71cfdbfd949825 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-20.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-20",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
index cdaa74986a4f459b768b1184a72f37ae442dcbe5..80a11f6107a95ba3b4eeaa5a9340442d05b246db 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-21.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-21",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
index 04d8becf1daeb0f45b5f7fdd9e06fc0f8748ad7c..5696e7cc573d8d6551f87e3e26b4b89752037584 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-22.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-22",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
index 4ef09c5c70625fed87a13d98b572fb8e6d068012..45827b74f0cccfda8ad9774c170e5074a1514d86 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-23",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
index c4577f6ccf4dfd67b0f680c3be292cc6984bf283..8dde588de4a3c250ce7933e5a6a6713cf7584b69 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-24.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-24",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
index ba0adf3bd1459341f3ee7dd5082417412e136e6e..5414db8845177f63c76d2d01207937f1143221f1 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-25.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-25",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
index 6e92b10fa7337578e739ebe9dc3fe4301d6a6efd..b2bca00bc09cefe2aa78817f0b62b329c834c340 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-26.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-26",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
index 4f296a8fea20ea94467bc5e3587eb409fab2fd10..c03f74c7fd3f0cab98af8a69421fd1258c5aee20 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-27.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-27",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
index 414903f03f397434455f03b2ac98a5e4f60a990b..c6c7dc61d535b84aaa4cc7d3adb8350fa09b0bf5 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-28.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-28",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
index 842d6fbcef98ce149f528d1349fec753ec314ff0..a014454caf1c50e70374ffeec082f806210f8ab9 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-29.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-29",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
index c51d6b463f48d5396969ae74bd31c98cc8c0a584..384835d60019cdbec0d6f4710511d52c46d7df9a 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-3.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-3",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
index 547030f4ee22394d1cc2a9b0e6bf677876b42ce6..5f4d39de591227a6161031225e5d533cb8f649b7 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-30.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-30",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
index fae1ee305f80c0ee35dbd28628595ee854f633ac..d27b148a1de1d6a70125bce856d151f800b37bb1 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-31.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-31",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
index 6d1be58327c6d037df381845e31e4521f2db13ab..3f007efe829328e2d61ca664a604fa8f7effa90a 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-32.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-32",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
index 2be081ea3e74a8036d5af853ae5f39c0cdfb2bbf..8240efc31b372e5d945183379c50bb2b15148162 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-33",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
index 66f2505207a327e6aa0651762a4c8cbf829a78bc..15e19f48f57fa078a81e90a3a9fbb1eaa3da5cfc 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-34.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-34",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
index ab520dffe457ec6dbf2d2f55f6c5da39a8c3c1ae..091267c99900c404f9c763318aa9d7639d365175 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-35.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-35",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
index 52fe167af4230a9839376efba2401138635293e7..a67991ccdce84afadd7994c356f556adc7661c2b 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-36",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
index 3f72099ffd30b9492b710d9a3e058636f9bbb719..bc96d03f712adbc08bdf4da57cf6dc500b0860c3 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-37.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-37",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
index 703da04401a66f56bd4b2de8c83e37c6eed07a2f..c8849b798cfded0023ac4eecd08f46731bb91110 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-38.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-38",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
index fe5271c56ddc302d8fc9683cc123c8cf50d94de3..3272885eeef840ed72c49861bac6745fe618b547 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-39.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-39",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
index 13f3d43a65c6701761a2c6b7f5fe3792b116e7ff..d10a3b6b275f1664fc81211d4bd4da95ac6bab4b 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-4.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-4",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
index 37c6af476e9bc25d9ad4c877cd964ce0188bcd68..372c78023031d60e9e53eec1d43940413a3b86b1 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-40.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-40",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
index 6e0959249532a02c5bd3820f33b9b06dc89e8320..47991ebe4b0d72c187fdb9f9b4d74d0832b1e1c7 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-41.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-41",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
index b791d69de1a77e4e39788e78f74238c6d7c1a07f..2245055b4b5e50fc3caf94669b4688422b3b2301 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-42.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-42",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
index b1659f5f334243050d423950993d3ce5cf469494..b767dbc1feeaf482226f92c886e1e32676ecc84c 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-43.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-43",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
index ffb9eaa24c41729cfc8ed7b2d287c175c2046d41..d0592ac740c408235ea4f1189b7ddfea506043d9 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-44.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-44",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
index 092b9bab2d962038a7a758adab9972ddb2f16bbc..7a3e283da09cb5c17d2e714f6e7fc9d07a4fdfc3 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-45.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-45",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
index ab9b386dfb19549ee0e7683d5e740bd61082cbef..49cf741b76e71357c1f7277037db9fa1b26501a1 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-46",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
index e9f89e29dbc2b7c08efdaa6be50de5cb94145721..9c33a12349b43416214493b42f39770bfe5323e7 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-5.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-5",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
index 6c2255fe3d4dd03dd4547fde4bacb40059dfc5b9..a6b6eb3aef998c74d9be4e208a9aad235bd3b032 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-6.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-6",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
index 47b9a13f5e76d8cc30ae8bc2f1a1fd9554ecc9b5..6b6c5ed313fb62270255e609598782e4491af9f3 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-7.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-7",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
index a2fb33c0867f4accecd95ca8b9ab70b12310d32c..02fd5978257d65eb408ef3b6d3d9f6d02eb5ae07 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-8",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
index f48485bf2cb22a4aed51c63c20df5cecbb0c9b84..aea4fb6f18fe1da715dc6154c899a27e4ba1797e 100644
--- a/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
+++ b/data/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-9.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "Intel Xeon",
-    "cache_l1": 4194304,
-    "cache_l1i": null,
-    "version": "E5440 QC",
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2830000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
   },
-  "storage_devices": [
-    {
-      "interface": "SATA II",
-      "driver": "ahci",
-      "size": 232830643653.87
-    }
-  ],
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "e1000",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 4194304,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2830000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5440 QC"
+  },
+  "storage_devices": [
+    {
+      "driver": "ahci",
+      "interface": "SATA II",
+      "size": 232830643653.87
+    }
+  ],
   "type": "node",
-  "uid": "chinqchint-9",
-  "architecture": {
-    "smt_size": 8,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chinqchint-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/chti.json b/data/grid5000/sites/lille/clusters/chti/chti.json
index 2a362264853075fe29d49f0edf4be8d78b10c0e6..8dd74a81bf2fdcfa47779e725ac701654ac6af47 100644
--- a/data/grid5000/sites/lille/clusters/chti/chti.json
+++ b/data/grid5000/sites/lille/clusters/chti/chti.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "model": "IBM eServer 326m",
   "date_of_arrival": null,
+  "model": "IBM eServer 326m",
+  "type": "cluster",
   "uid": "chti"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
index a2062b918d223ded676f88e48ce9414a6f4d47d3..1fa827c1b2e836291551633ef4d01fc09c9dafb2 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-1.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-1",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
index bb42baa3451a4cae535771a3f3ae3855c0b0b09d..6d692c21a9f74dca63dc922aba6e00ab333bb6ce 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-10.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-10",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
index 0c2869031e0523daadee87aefdd980a0b873faee..840dadde625e5e6c4a00e6476a4e068bc00207c6 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-11.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-11",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
index 05f2779239acabb13ae4ca800aacefa803ae179a..12461636f6249344ab32ed2085365afe6923bdf1 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-12.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-12",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
index f714c0fffd3b12726ea535ab6e0f3b79b49dddfa..2800753f3fc5dc9bcf4775ee9c77028ff8cbe3db 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-13.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-13",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
index f37cc3c7d01b198064724b4b4c9675981de05d2d..395c601c820ee3453240943c84f9776800a6469a 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-14.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-14",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
index 88de61b0e3170055d3912b1fd6c74625ff1220aa..c231dbbba4910247a90eb3d038ed7f1b2a87548d 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-15.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-15",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
index 6026e5f787d00699a8d31ba1e0f5eb1371806122..afa70c25e0054e8d8a904dc489effdd673ee2353 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-16.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-16",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
index 2caabd81c1791eda1acc5cc6c0cb747cda22a24e..9ce9a5bc2776a390502a6eb46a6db76b8470e4c6 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-17.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-17",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
index eee1cab4d902106855cfbcb9150b73193d1154fc..ed8d2dda151249fabd7405d1c7a7e81e4d012e18 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-18.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-18",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
index bfcf97f042ba83876a8b420251129bdc7e7d9202..bd4b5daafff331bf3853a8b406ddf7fd09e3d341 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-19.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-19",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
index 8ca09c2471d295000862a529283512b3ed081729..fa369f4086a5a8c830eb4105e3c3aad5418c7334 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-2.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-2",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
index 961cd1f990e5f6915dac55980d86e07c85ba2e97..771b82e0a1e7e324aa6c7e413bee43a3f7f725d7 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-20.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-20",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
index f553b577271f2dd9fb469d4aa2e08f2be4554426..7ff83defbc98e2bc09dfa8609abc7f471dd3b8d5 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-3.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-3",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
index 5064c5303cee2eaec8d7e68249d9893644fdb911..42b0c43ad1f11809b1806d9057251844c5014c3d 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-4.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-4",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
index 6c4ce01fd12eff47662748e6496264345cb5ba5b..190c1413e9e528b0a46c538f8542b0b12711d56d 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-5.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-5",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
index ed9181a50a099ff5185b7694694974eccc49c4b5..1cc8efed8c7af4fdae53b1626fb7fed6cc547ef6 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-6.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-6",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
index 300d06b473b7bac659692c775a6190f4467e4083..d32522103abe1e995fee2a43ffe02c2c6f843b6d 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-7.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-7",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
index 0a9a4d26e99c5a082aaf21496fa3ee69b8078ad2..3c2919ef6d3f6065ff71ebc9bd15bbae89cd994c 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-8.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-8",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json b/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
index d6d89e064fb4802236146d6d45824778990c4763..8d4d1ba1656a9cf64a29fe9094a4f09695e15c79 100644
--- a/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
+++ b/data/grid5000/sites/lille/clusters/chti/nodes/chti-9.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "252",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_svw",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "252"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_svw",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chti-9",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chti-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/chuque.json b/data/grid5000/sites/lille/clusters/chuque/chuque.json
index 17bb4d63acab67a53928b95a5e4c8317f7578d00..2620146bee73bc03d869f33c333bf6ca0e0c0417 100644
--- a/data/grid5000/sites/lille/clusters/chuque/chuque.json
+++ b/data/grid5000/sites/lille/clusters/chuque/chuque.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
-  "model": "IBM eServer 326",
   "date_of_arrival": null,
-  "uid": "chuque",
-  "misc": "deployment unavailable because reboot instruments are not enough dependable."
+  "misc": "deployment unavailable because reboot instruments are not enough dependable.",
+  "model": "IBM eServer 326",
+  "type": "cluster",
+  "uid": "chuque"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json
index 90b8d7f562e40431c5eaa36a2829b99e4510b8eb..9645f8e1ffe9de36041792b5e27a63e29cd0e8e9 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-1.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-1",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json
index 928c57cd6af15a9f8a73c4a5483e59faf00202d8..01c9b1726e736c8aacf22e2403711543ff82ae90 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-10.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-10",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json
index 500e22418bc09ff5dffda2ed956c342b20d028f3..f9c8918602fd8f479137848db359a8ddbc48a1ad 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-11.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-11",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json
index 5c6cc12431a52720be97efd375a62e1d87cfd2df..dd79f9e9b24a062a659f67abe96b3b5c06b19e8c 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-12.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-12",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json
index 948969ddfe5daec02ca4de936c6fe1d9db03cc76..e68bd8177fb6fdd005ebf3f7c1b19946c27c5b17 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-13.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-13",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json
index 68623e54f44d2da28ea57f9d77030af31fb96fb8..e331ca66fdfa2a5983fbd58dd7a4642c7858c63f 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-14.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-14",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json
index 0a015dce19209e6533cfa871deb32e84780961cf..3619b36fc1f17ec65aa52d4b5f079f354dea0fad 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-15.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-15",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json
index 6c1516065927464413cce3bb7e920184507bface..e5a2544e2f7369b43d26f05e807b7f547dbec499 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-16.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-16",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json
index 7de3bcff0d9bf64b5326ee10fe56ab4bf41cd586..3df90b1f34f2b2f203f986211573e03447ede8e5 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-17.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-17",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json
index 041112f1f177706cd7466d870de97de8524d992c..7928618f88ce221f3565cbbe671efe4d585a4d09 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-18.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-18",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json
index 94aaf8f5a92c493dce8476302ae28fe2d6fb4975..c4574c62170267b330d47f8009b7abea1771dd28 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-19.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-19",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json
index fa8d8f49b6bb123cdb72457f1d0e6022c8abcb85..f3b031946c3d4664c8c4658d0376b2994d13f626 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-2.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-2",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json
index 7aaf55a4afce57d969e76b5b5227716c2553e9df..f4700fdb6bfc859412fb417d4654f1815d14f4a7 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-20.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-20",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json
index 6798bba5e3d17283a3a6d5599326a393bfdf3dd2..470b74eb7257c50de50f00e0ecade1a36048e290 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-21.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-21",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json
index c0f288b50a2951d98dc65cf7fa6dd0857ef729b6..ac2b37861d17f863a36369153a774e67547ae3a6 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-22.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-22",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json
index ee8bac56b9972e6111f0caa0cb12994fccd9351b..f8008b827b52133befec97cde142910b74f4ca81 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-23.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-23",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json
index c2a20a401dcff264bb9a433137841d06e5a49e80..7816d711eee25f255677c658342a363335ada5dd 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-24.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-24",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json
index 6a9d55d4d3bea4410b1b872b19e2049a616251fb..0566f8a93bdc28c4582d2bcd03a648d7391cb8fb 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-25.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-25",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json
index 97a8095f316bfb16fba6222a1e9c1976c69393ba..6c3d9a044c101b816776e2daa5facf62be477eac 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-26.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-26",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json
index e2aa9429ec2b3efd829f1ad1bdd29fe1fe9abb08..24186fca51f122844e870196bb94d1ade0486953 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-27.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-27",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json
index dd7adf2e776e482e0cde14b2bd4b1500bf5ab9dd..a5be11a74b47ae1f8444f2c3d34c97089fffdd2f 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-28.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-28",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json
index 1a32e235cb4868170f3fa66c3bc39dcf490a1a19..97279fc73d2762afd76b592b26b4bf430e567c33 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-29.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-29",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json
index 12c35d58631431d941826c484b6ec12340e67108..d88ff5c48980987bb85ffea76ef5d5097f55810a 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-3.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-3",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json
index 6d9f3431587fa410761c95b1e01b4821cac7571d..a725e7b85e6e906cbafa65459e1af363a8d0563c 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-30.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-30",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json
index 9ea3f5a17897f617f9b3685a8adc4d0618ef86c0..cc16a41c95e1e205b554363d7cf8e1fc4517ee5d 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-31.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-31",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json
index d57deda4cf4c8c6d0178555398d4887eba72b38b..d0d7e2bb2d2ba94ee0b60df732e8c64e53b3230e 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-32.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-32",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json
index 423f70d659d8b62a22b51103e0b2bf42a3c6bfa3..ed29e7ad12a59d3e189f14652576f51fb21f1e63 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-33.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-33",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json
index bf80a22794ccdb349642b0729d17a1f4617017be..e9274627cb8e63f10ea57cc7e1f1a781a2046626 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-34.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-34",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json
index c1f4d9cd1a2c63a131c91ba27878ff3f9fe8ea21..e0ac401d710dc8d28f777003fdf7f907e58e7aaa 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-35.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-35",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json
index 82c9c2598d409ea3ec36a20d20950cd155af8151..89e9a6327ff0e8e9805ffe0213e95f4390141b8a 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-36.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-36",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json
index 49d35e51c76bcccbced68e2153cadbf33127816a..ebda2cc2035598290bb99444e0eef0a7bd10cd64 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-37.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-37",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json
index 455f22f6edcb5006be4a4e0ae339e55482c4e1ed..434e4a97eeab060ff18c9a5c31e64096e8b6f29d 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-38.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-38",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json
index aa789e9b2aa775d148c51dc3ba0dea4aa36b3c55..b22332b20ec0f1a76a4f59fa52bf79c6add64d99 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-39.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-39",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json
index b49e36325175655cc94dd39fd283945987fed07e..cf5fe4243a351ac35c32e19d34cbdcfe2b3efbdb 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-4.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-4",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json
index 04e33997d3a04846eb85252e9a9317aa1a2bc490..c0d22e642ddbd6a59e57afc5a84ebb84b484a51e 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-40.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-40",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json
index a634bd1eda56441fa608d8bb71b3cacb0681aa22..050ec50c6b18d5db0094114435f392929d7dc70b 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-41.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-41",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json
index b18ea045a27cfe4eefd43cabba0ea24526ba6730..c53ec36a70c260a7e6513ce79470e89c91601beb 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-42.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-42",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json
index 6dac93e0f2ca62345aa4e608f8dfa1fd4325894a..e1f292f577b30784f01e5eb69692defa9411fab7 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-43.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-43",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json
index f465de59379e5e81dfeb41cbdc28d0878e7b6ebb..87a14ec3e976707fb607fb38aebb41824c32fa70 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-44.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-44",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json
index 86a256ba293ad241d6bfee7b251aa3b1311e3169..ba59d4aafee7de9c45772c60a156a806f17bb5f8 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-45.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-45",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json
index 3297a97d39358ff4d69bd13c2d27e43b1171c5e3..c10a8146d3f60cb8ccf5c8f6617b3b6e612adf29 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-46.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-46",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json
index d2ab48cd98a455e161029b501aaf9ac5c361835b..5398df39097530c6ef10cc94361f4ca797474522 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-47.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-47",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json
index b1b8ee4cb9189cc7cd59afb113d10010d45c6184..d42ac79087a717c184541632cc40bbdac955180c 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-48.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-48",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json
index 4e33aff3e08df9345c4dc5c83d03e00ec2cd08c1..47e5ece578fa0712279345e89ac169b5f0834e3d 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-49.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-49",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json
index e1f528d3a29d4d7c3a6c8f01f9350a626d2e5bfe..635c5994f24077066c782d33725e0448341bd3c5 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-5.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-5",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json
index 3f3239a47d5c70b378091a8c09a4be7487c2ab6b..74006a861c1020bfd4472dcc7608bd3e9d70ede8 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-50.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-50",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json
index f3b1f62e7784a1ccbdba88d26c23c001bb6a92bd..67c31d24292f3bf083960478f5288b5ed4f364d0 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-51.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-51",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json
index 3fa7bc5402a6be9137e32d76be58c14162e0ba47..ca2ec9e6542801f3314fc08cf929acea8bbcd2a3 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-52.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-52",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json
index 5e8c1d422da5df2fdc77ebd0ab10997a0e129536..82d91f63f9232991ca9f7a81abdcf28e953c85fd 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-53.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-53",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json
index ef047a0e5e55a5a51a1bc5ee098bc332ba97b41d..e6077b106e85e3dd022e7b5aa63d5ba09bd077e1 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-6.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-6",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json
index 902c7399dc2dd21f008aa6628cc7e76de39dd1ac..404a1c80d1efd0c8349cb008be61a4c571df4b86 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-7.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-7",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json
index 94823b5d8575ae2563ef1b47206f31be44946c87..f5f7fe9009e70f568ee3f7cbabf1af17e41ffe96 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-8.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-8",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json
index 6842a63cc5ad2c0ebe400d61d3342688000d7410..26e51c6d3ce53b8088a47d3378e93d07fb7e4031 100644
--- a/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json
+++ b/data/grid5000/sites/lille/clusters/chuque/nodes/chuque-9.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": null
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_sil",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_sil",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "chuque-9",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "chuque-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json b/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/lille.json b/data/grid5000/sites/lille/lille.json
index 6c229de2e8b7d264633fbc3a4cad2651e43191b4..4967f2eb491f07bc37e6ff129ca5fcbf7d1ef18a 100644
--- a/data/grid5000/sites/lille/lille.json
+++ b/data/grid5000/sites/lille/lille.json
@@ -1,14 +1,14 @@
 {
-  "longitude": null,
-  "user_support_contact": null,
-  "latitude": null,
-  "security_contact": null,
-  "web": null,
   "description": "",
-  "sys_admin_contact": null,
+  "email_contact": null,
+  "latitude": null,
   "location": "Lille, France",
+  "longitude": null,
   "name": "Lille",
-  "email_contact": null,
+  "security_contact": null,
+  "sys_admin_contact": null,
   "type": "site",
-  "uid": "lille"
+  "uid": "lille",
+  "user_support_contact": null,
+  "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/capricorne.json b/data/grid5000/sites/lyon/clusters/capricorne/capricorne.json
index 255babf59cb54310ba6ab41e3e847565803c5471..1f2ed95fd9c70dcf53f042f071a732b2ea8f3f4d 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/capricorne.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/capricorne.json
@@ -1,7 +1,7 @@
 {
-  "type": "cluster",
-  "model": "IBM eServer 325",
   "date_of_arrival": 1101902400,
-  "uid": "capricorne",
-  "misc": "bios: 1.36 \/ bcm: 1.20.9 \/ bmc: 1.46"
+  "misc": "bios: 1.36 \/ bcm: 1.20.9 \/ bmc: 1.46",
+  "model": "IBM eServer 325",
+  "type": "cluster",
+  "uid": "capricorne"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json
index be8d0361433546a4843805640b475997f0b27788..0c1fd8d379a2f66547d9808267c3d8f6fef23474 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-1",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json
index a26d89cf1fba4f233559ae35eac91bd27d653077..1864e40e751691e232b38e0790d781310bd7a66c 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-10",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json
index 9f80fdad86d7dc3e58d40133122c796044526cf0..0d802c030be57dbf68ebb5b5d8ca46443e0726f4 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-11",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json
index 93161affa4f686cc5b7b2040f87f52e5cfcd4a8b..d982eff46c40edaecae8802e6d61c8b6423b983b 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-12",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json
index 7c14c47325305f48a1863bfb959614ae072f06b2..31f83fff8604c29964c974c8f544d3dc456930d4 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-13",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json
index 418f0966ff4ce81c97739865c3b679aaa9e1c08a..381814fca43ee9b02bba30e0d49c97b011174cbd 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-14",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json
index d318eb770d2d4b98318a217cbba0c1bcb6582f71..59e25defb8aa770961f52a6f04b5897a4395aab3 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-15",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json
index c6a4960a9a55c2f6edfdadc213a92fe1f47c7eeb..87e8a02b8f84c8c7c6f8cdf23754e8823b8461fc 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-16",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json
index f12b14e923e736773aa2a157341625a3b99fbc53..0b24330e0755f3d43e62bb89c608deb2886789cd 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-17",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json
index 75c231d33a7f3965506320fdaba8cfad15228008..6ec184e85afc51c740f20217f4611bb4f22fff67 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-18",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json
index b0c7bc0c8951dae54c06b109c8cabd4a31e063e9..e5e635ac142f95198c36e57b31b4e33d85ba3f24 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-19",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json
index db25f3de6e51aa4791b4eb55f54b273c664b519a..08929e581d23ce20e053e8374f4a458ed4fab9ab 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-2",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json
index ccc1b75688f5eeb84fd3c6424efe049c4ab47a39..4aacbc8e03326a055e5024816d00f0b988cdfe90 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-20",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json
index 777f49afbf071d4b1a2f53f03e70f1d4fd8d01ae..0f33905a99c5195a2a730fa53a58238ac6d9fb4b 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-21",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json
index 02cc92020a0a17bcf2ed5f6d824779334ecdb036..1613f3a6b76373f7df6a209c1761309c07a9d0fa 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-22",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json
index 9024a297d9abc590885518fb38604ce249078e4a..6a9c8c2daec73acab96dc3cf8eae4cecbfcd8c50 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-23",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json
index 37f202075c8a9003f8a0921915a9a70b0a238392..f497a4349980a6e1c776a9b597d93f1f24f67f9e 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-24",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json
index ff2b463bc226ba0aeb26ec22fe160ee8d0782123..48ce93996a9ab953415122fe0ddfa0d56fe62570 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-25",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json
index 1d72c1a361739dc2b0c97a1237112eebf085a72a..9b6396b73654e5059833c8206abf5b2df9f0bda3 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-26",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json
index 0824f5f397577e021bb4b2fc78cae9dfc1af65d8..2e2a7201f03d5ca2ee9e0204496d455bab4174f4 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-27",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json
index 58244f0f472ad2fb75ba7dcea14cf9f8a9aa5579..68b3d1b918504f7e94da27c93dcac83823d06f4b 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-28",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json
index e6d8859b355029c0a65e71f605ff5efc81cf6cff..2f9c584c85788b380412251b0e56455fa09502ca 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-29",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json
index b5d032f44043dcaccb80f62a533531f02b276cd4..48a7c0369e3ec3abf98728e093727c0b30945f3f 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-3",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json
index e0f0be9732537df664fe32c852599e43a8f26334..037962fae3a5f10944b788b373ffb1ad8dab096c 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-30",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json
index 9d044b96e8fd27502252b7bc819978b1aebb54bb..0b9d55438b1c33ead51b7e6a91c856f1c780037a 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-31",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json
index 1afadbfd927d44cb9886088411418d826b66acdb..a996ccff485a3421bcf67067b7b4ce47c906af79 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-32",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
index 7bbe9c799a866d0f500266388570f4117649106c..2c474c3ea6ba70a123baec4cea5dcb3d7003056b 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-33",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json
index 4bcff997247ee0e78535880f3c63d71eea4ddf92..a882dc3514b2a3a943da68f0bbc1b83ebd0a92af 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-34",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json
index 2de5cb0d2adc71002d0d46f7ce783d2b409fe1a0..0af0514abee2594e576a679f5831e90acbfd2b33 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-35",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json
index b51c36c332550fbe7603b63ea5a46cca19be6786..6824145b007d0ba276925f5bfd5ae6b2b400181e 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-36",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json
index 2b56b2f9f4ee6fe35e23ca3b8181eb315d635e40..fbe09b9d14c81379cfa24f438c5959e8e08cd59a 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-37",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json
index 64ddde2284a04c4a972b4f0b39f5f7b9a7f9340f..a03f2c2a416a21ec2d884efaf5bf7d998934ddbc 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-38",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json
index 38920fe33e9926f513ea745907e31e418e9963b0..7481d22bd29dd1cb90b69f00a186e3d87f7764e9 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-39",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json
index bd618e46e70470859a8e35dd66aaa16c7bfe4cc2..832c0e91393bee76a2be0a2d37c5c3dc4d1ce6e6 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-4",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json
index 7ab6f5e79ec3f82728da5a86d52e67535d3570c8..fd84ab6f6fa9b7b89cdcb36b61393639a0e7ba95 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-40",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json
index 2248420a714cb678a1b91e7bcd9a7b35fda148a2..147b1ffbc35863f86cedadc0d121c23d53728f77 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-41",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json
index 139fa7daa5f61f94da08c99fb580dd289a2d649a..8223a902a09b3520f6faec84aee2efc41e0c6c78 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-42",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json
index 32b58231d6e416d79203991cdcdc6eacbe93d4be..2bb6255c71f517252b1e711c8051907e901f970c 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-43",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json
index 07604b7bf2f3f618439c92552ad341c7b8461550..d0d6db45591737ab7453369a1cc8f3d7be3ab956 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-44",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json
index a54e9252448260a16d89fc0714a4ed7f1cdd1d0d..861cb433ca16c2b4b3cef5c3dd57d4517eac67ee 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-45",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json
index 3c40bd45047ae5a9908bcb5cc277ee1d343a4842..3ae2be1c33a574ce17cb2f4df43a3833ce68d355 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-46",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json
index 95d7cd75db3b7d427ae77f828b9699f0b6227ec2..f087b86235f7adcf6ddcb753bc43d16239c701c8 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-47",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
index e69fe93bf1088ebd28318d92ad4fa50a487027b7..4273bc255e8d888ad6d8417206cce9200777557f 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-48",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json
index e77b96abb15a83b7d8ad1bac9813ebe209138c78..74ee1c2f0c8c5dd5980b609a613ae56e7122f746 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-49",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
index 66adf29eb00757b0ec1eef6c65fe3eb56f1fe223..c0e7536f22f3ddaee3beef7708b0f970c5e5f771 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-5",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
index 160a33fb48bda37e14969e85d88472b9944a5a83..ab4ffca7c0d741b754db7f5cb577e88a7ce78198 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-50",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
index 92f62ae2e924af49914bcb03daa34015d132f655..d96f0e533b8f02a44df98400669cdc209a2af933 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-51",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json
index 2ed8b716c0d8bd2d76acf64160aee874caec0b01..ff791055c140742acd7521b8ce9337a4602b1fb5 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-52",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json
index 1c37ca98cfb93437272db879adad20309c3815ac..dcbc08f45211a5cdb9c6979231f8ff79f205c13b 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-53",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json
index a57d341e9f61d4ed6b05c2736b258efbc2895f85..ed994b429a052a6f2f9f517de47d05c4e6376e09 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-54",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json
index 098c41a18ea5518cd2ea5a497e4ce60d1fe563ba..8e276612493834e1ec319da4dcabc3718c14fe7d 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-55",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
index 50fbef016d8993e29fc6a17facb4903975463208..c3dd07736a5ad8813bd7353326faa01897888959 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-56",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json
index 7510054cb95ebaca110c23031b3ceceb60a441c8..637036c907b7b9b83c93c3880425c3437d3d45f2 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-6",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json
index e494f3baffa49f575f2a86653375f103607d699c..38d7dd37b5d13339362b79387a172367edb6a559 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-7",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json
index 9b3be2289a83e45cba949d90d830cf86f837891a..4b0a08cf8fb8f88543ecb74d69ff59c97a3ea7a4 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-8",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
index 3703abae94b7450cf954c7164df5a87d7bd6a214..29b3ad0b9c32109a3d98ffe61e78648a7d997767 100644
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
@@ -1,52 +1,52 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXF-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXF-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": "amd74xx",
+      "interface": "IDE",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
-  "uid": "capricorne-9",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "capricorne-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
index d7a31510a35b172752b5365bd8b8dd5df2b1b55b..d2d1b426f87e198c46da68f875ca73844eaa90ad 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-1",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json
index d1d4761c27289060daae8b5d6c53630a285dd786..960c679da2509eb3176dac7164d6d948f41d9ca7 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-10",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
index bf90a76a4518a8cafbbe83283069574ffdb2faeb..ac56700b01262d549723e25a9dccc98cc3bc8869 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-11",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
index 4d95fcb2ef3f9ca82f20284cc681ee689e8b3988..82bd56d9bcb3ea23495dcc3d969a585a8696e2b0 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-12",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
index 66b256c097ef8ec50f01d518e44462bf70f25498..76bcc2f73154817027b910f294bc1044e0283150 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-13",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
index 3bd30996586d1eb1027c51d3000e06490f9cf9a5..565f75bb34becb514213cceb33380f0c0cdaddfc 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-14",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
index 3eff456a4f822a46b7dd7ae2ceb74a21662727a0..cc049adb6e1dbe9ce95c8be652c1826e336fffd8 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-15",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
index cfce3df836a85b4a3bbd2023eb1caa2a473aaa86..5088a487e5f414610b4c7d62704eff1a3b71dc28 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-16",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
index e67259c842301d0b916d7a655b0cd5eff3d84c9c..30eb3f41ce6a48fb5eb592e88e74e90a7292549d 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-17",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
index deb072e4d12b8b730e28ea6f3a1318944135e82b..b655daea3e27efd01d277956ef073344663f7b71 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-18",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
index 47bb8b93478647c3c8ddfe72441d70c31a1c7ce3..c196fd4487810d4c0fdbecbd71f535abcbfa4863 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-19",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
index 5f6e3a48ba908e4d903a65696498bff2c710266b..a51636045df0cf49d3b2328da73f95264c603535 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-2",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
index ec9c34cc649ebcb98333e5aabe69d85e85e971d5..e458a6264c08907751599e1eb8ea1d39e732f879 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-20",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json
index c1d9700cb997f073b2bce0d6875649c1168a5188..8bf4c9fa97f50b71fc605de59aaa53e625cd5136 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-21",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json
index 02b68178f9a45ed396d2f25e6636d2b5c5b5a785..d314860ad360f03fcacc05bcf05154bbe01c3bf9 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-22",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json
index 3fed7922a879dfbc3f1a8a70c61b61e96a142437..ac88404459c685790779b509903c5cb83134baa9 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-23",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
index ed47965d2995f62a82e20354a643cf54081beaf7..16e21025a397e1a4ce263a15408d05c73fcb7bea 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-24",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json
index 8068a107d2abce105349453c5f1253b9a6c4f626..7bfb39e1d8ba5548020ec8df2ec6357fa137cc7b 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-25",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json
index 31f82e233be9d0a7047484f5f4baf86ea48827e1..1eb0aa4b27151ca4bdc069c6baf202c93e31070f 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-26",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
index 24002c72a0155a2276a18752730ef2eeb35b2d19..b824e313b3c2dd97f71cb5d90460093c753b344c 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-27",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json
index 2a4342792a727305e8ce937b6344d89e8f326392..f4e0b3e4e0ead06b6c55eefbf01cc49b10ad3c26 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-28",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
index 97a5e442d5fe987e97ab173e6c567b2a269a2d34..47f342ee30ef16007ad9b91c2f80b4e8d68504b0 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-29",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
index fee29c9bf560bd052da86992b3e7c39217bc0d7f..a3e9467f4280bbe7af83de07e6a4816c8f004762 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-3",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
index 620c75c40a2662b9e7e2f347ac37805a925b8424..b20d83e09d9d73210efb4baf69251c494dcbe3ab 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-30",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
index 2f4a5b4b26d47ba4be79116e6309b697c7b05812..b527579bfc2c033dfaeae3c06b1f06a12db6f813 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-31",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
index a6f45dc9f8c79f53db242462ce74a6ec5c72d1c5..4260635135209805c60188bbae690f5cde99569f 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-32",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
index aa03f1099da11ba991a5e4afe39d08a67fc57898..adfe25891437fea785b552f7c708322e3e70baec 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-33",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
index be06bea5be16ecee30a068e75928a966a7f10ce6..657a4a9ba247996407a176d753448f202c8d56d0 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-34",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json
index baaabac470b07720228bd3826fa03ba88bd1cd4f..e863817e426c11424250bcb63b12a7f92b6f6998 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-35",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json
index 1df32add96aca6732ebc3e1d691f9dcd23d2a9fd..2570745ffc70e2f1549fe1d1325ba3769cd8f1a1 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-36",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json
index 71991d3ace07effb06c575e42befd964db11a002..00cb3936f7fe8aa72e0a6e12c2cb16552cb428cd 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-37",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json
index 35a73e4f072080ec399a8add087bde6b25f88339..e0c0267d25cc8b58aec3aa9dd1fcb7f03cbe6cdb 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-38",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json
index 693a53343748a6ef565a2ad5ecbb789705df9c72..a8243774d309a79edb9d3e86cbaad68a22f5ebd8 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-39",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
index 76838708c5f794d283c57faa0f43d0216baa36ef..a14280e81b37eecb1ca6cc17e1749f3be0da04f5 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-4",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json
index cbc42847c27db27493062c1a5e784a66edd40b9c..df5495e2a17f5e4f38326cf08a45d9743e41efff 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-40",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json
index a98ae29d3cd8f21e66b29e7f265ee73823fc26c4..29fc68c5e99fdd0d5842107fd3cdf4d45dc03a94 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-41",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json
index 550589f392480dd4a327996bf21a9bcf3d8d4996..8fadfbcf0803f996cd48fb632931eadd03b4e125 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-42",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
index 8aa32dddc223375c3e3601e194102071464b0a26..8b89a6582957eca5609b6cdbf0e80afe1e6778d7 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-43",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
index b02bb34787c8f5130867f161dc7cf2debb776904..7150a813c3d62f6a664a0d4f1148daff9f212885 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-44",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json
index 0e9b09997af147d9e999083ae23d050b4c2b99f2..d01465a43dadd340400370a642a75d5d60733678 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-45",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
index 4b973d11ab2d458bf65e71ed61579c073f92799d..fee4e8693f88d3d8729cf531155ec1e38ac79854 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-46",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
index 4ba05dd7333e125002abbebdfdea631cad85cc8c..f72609195cc9a99484c3b744a7b06cd9558d217e 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-47",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
index a99ca6da416c9a7c7a71930710003303f761a2cf..ffef518319a393d5cb02ff47f4d6a91086323d63 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-48",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
index 2bc3ec98cd8eb93c2c6f5723400c0580e14f4ea0..884b6b2be83bf951fc3dc2b5dad06dd0c63df0bd 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-49",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
index c749eb61ee8a24bf1f01031372be9b45b0e4a9a1..a066bb9f9e33560134b0d2e204dd4cd8417851ee 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-5",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
index dbda75a5d6d3e5c0b685e06c171c106cc021a274..a468b3abff1dbb191771f79219106634ca4f6357 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-50",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
index 6127086848e589e13e60ea598b11795af080930a..ba0facb50ca17bceb7bfd93fadef91150f05ea83 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-51",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json
index ed4ed2cc6557e19b84c2597be9a09134b022a7d4..194baae8067b85c53317ce12855100e98f780d34 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-52",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json
index 8f822e9a418fe21b4d5274443caa370abd03bf0e..b0567be43d13e3cd89ad1f1fa068043368f632fc 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-53",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json
index 030eb2d7c1eb127434013be1bb18b40228104a86..3e94594db43d8a10d92efb7b98a47cc9f0664f87 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-54",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json
index 3794e32e435d3c89afe379a12abffe75da0078d7..98175c37dad3eeeb8b55bce19d5e8be40e942a27 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-55",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json
index 2e3b9b339130fbc6440d145ad60cacd6b9e4a0de..05527e3a5e7c754a1dc471efa02931e57687ef28 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-56",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json
index 0582729c439aed0f9a1414faa9c3024a3c0fcece..15aa8ed5155f0dcf290e9cf5cd99496d9f313d11 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-57",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json
index bffc950e90a6715bc0ff2580c59d66ec259d5698..b2ab029a2b62b67dccba466538b9307a68238939 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-58",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json
index e7de3f4863a359086e7d7dc7d49939188a38152d..4a16e7507a15b9b90ffd74bd44c039e1edac391b 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-59",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
index e141d6f1bf99b208a1b600c96cddaade3996d75f..1ff7887971c84656d45aae42e609eb6a5a25b7f2 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-6",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json
index 43353a3f302a97fd026dea4f384b68837e2c00f9..66cfc3b6c336129850f77d9b6c1fd536fc53f66f 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-60",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json
index 570667113bc72211b00de41e03208b52eec0b0cb..dcdc4c58691e5844b0ef8534dea6a6c924e0c7fd 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-61",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json
index d2bd9b9b5ebacaf668c9d9099c484a35f7cf4052..1b1413a86582e5df0eeb18de217c3a85de95b398 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-62",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json
index 0cb22af9d8617a28ed43f27e0fa36fb326f38161..5fe857be2412f78e9246fe2248de5e25d671ed4b 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-63",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json
index d6543280c4f43dcc48eb33aba9e83efb7feb1327..82b3379ab8bdf0de174c524b36a156d5b50a68f8 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-64",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json
index 56ebab65a62aadfc904e29fd0afa4574c4fa78fd..447bb2a012d37dfca44cf87013d26089d14152b8 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-65",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json
index af4fbf54865f9830f8b7bc4331aafd4e34be4563..ecddc6ee82bb1ef064d380c53472c4bc704c3292 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-66",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json
index 02917e9ea2e17aa2742f5383d5c6129d1174e8ac..8db8deb11a1ac705169cdb3850a32d742d11cd78 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-67",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json
index ce1c03edb58ab9f4435ee1f81142ff9181429af9..46fe44742e82f6410699c579298f428615c0da3d 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-68",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json
index 006f4482723eb7656e139973a799f89d20d11d97..9165e72c16da9f5d970cb33902144f68524289fa 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-69",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
index df525db7f677a5311fd308a0942b5de4757b775d..1082bd7a45b2d1a99eb83fe21b596b499720a82c 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-7",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
index 3db5cc3b6ad56699cac39d4fcb941f16cd90f8fe..2b5c85e288580d992d4f6a6e99ddd0953e42e464 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-70",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
index 5ce2dd03745f68c0235c61a1f2beb39c7d980056..455e4dd3d3568b5e4a4df2ccb33f524677eda6f0 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-71",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
index 2ac351431633257dcb97fb9209fe73ae2de31db6..a5fc1c5b059a815f4614f67a557c6f4d67dce242 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-72",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
index fdecc92b61f1db8ebc6c1833229b2621fc7d7c48..b582f0664c1c907ce10514273d37f2c0a1bce47d 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-73",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
index aea09470f8f01091881b5585829bffa095e01645..bb6d8069e80181e6636ac2f6fc429aad18ff262f 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-74",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
index daf53aab51f7685c17b37365b13c2027ba6245cb..0dd1a9cb446a27741b890964d924565b10ee3f71 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-75",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
index b8a4c52e334489b206729c800fec9b4f85fb4a8d..ee2296ce96e70de4917e592adc3815dee09ff224 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-76",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
index 8c9de4f3f1f5393ff9e54df4cbdd84822dfb81dc..a2f9bb9918424c92c13084cce0a3936e290c0e7e 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-77",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
index 9aac1d3a206870a3e90204fa389c84a38be26764..2f8c82c7c0298e4ab83f0dfe3973713405a5492a 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-78",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
index d32a4cf2e0640d95c435693aa13b9074acbb84bc..ba13d71ede8b10c7a461ef31f1d4227979bfd3f2 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-79",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json
index dd3cc22291b51c09b9143b3718c441cec993b7da..bf4918165166f5cca064d3b090b19f713b5da7ad 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-8",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json
index 21eff1e33092ddff007ec3c7f22096a4ba66f042..54e6cf70bf0b65a046bcae9afc0de3804fbfa465 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.json
@@ -1,45 +1,45 @@
 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "SCSI",
-      "driver": "mptspi",
-      "size": 67986547946.9299
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
     "name": null,
-    "release": null
+    "release": null,
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
   "type": "node",
-  "uid": "sagittaire-9",
-  "architecture": {
-    "smt_size": 2,
-    "platform_type": "x86_64",
-    "smp_size": 2
-  }
+  "uid": "sagittaire-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
index 978ccbc707e4179dbebe640cb3689152dd0dcf80..114ecd918e399c4b9490e54b5f08c4d03db0ebc6 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "model": "Sun Fire V20z",
   "date_of_arrival": 1151755200,
+  "model": "Sun Fire V20z",
+  "type": "cluster",
   "uid": "sagittaire"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json b/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/lyon.json b/data/grid5000/sites/lyon/lyon.json
index 903cbdd0334e88db3f9731c4bbf7a3afee0f1124..9fe817dd08d3479c8a20b451b9be3596c0f4852e 100644
--- a/data/grid5000/sites/lyon/lyon.json
+++ b/data/grid5000/sites/lyon/lyon.json
@@ -1,14 +1,14 @@
 {
-  "longitude": null,
-  "user_support_contact": null,
-  "latitude": null,
-  "security_contact": null,
-  "web": null,
   "description": "",
-  "sys_admin_contact": null,
+  "email_contact": null,
+  "latitude": null,
   "location": "Lyon, France",
+  "longitude": null,
   "name": "Lyon",
-  "email_contact": null,
+  "security_contact": null,
+  "sys_admin_contact": null,
   "type": "site",
-  "uid": "lyon"
+  "uid": "lyon",
+  "user_support_contact": null,
+  "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/grelon.json b/data/grid5000/sites/nancy/clusters/grelon/grelon.json
index bdf15c10b41f3530654929f6f158c78dbb64be70..9bb89bd47adc596020727fc8bdbd92c4f8d4efeb 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/grelon.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/grelon.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "model": "HP ProLiant DL140G3",
   "date_of_arrival": 1172577600,
+  "model": "HP ProLiant DL140G3",
+  "type": "cluster",
   "uid": "grelon"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
index b9370a04f55559b88964e85164aa8b70f7b216fc..2f1ca20c935eb8f6c1b0a9697e5af76b74010869 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-1.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
index af79f0babe1a351e7cb5ec827db3f3a384304eb1..38d3a5fd80172ee001463b34da6d29910474aa42 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-10.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
index 267d50b04f3a7091965e0201964ed18c638b8274..469ea5fd8d704c48f87bed71a45b4857962e8dd3 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-100.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-100"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
index c9b72373489ef0ce9061532a894ffc6b32bdda24..ec0ac4dc4707fdcb262015d2d1305bec524c70eb 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-101.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-101"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
index 21d4a1dfc140975f9de2926449aed83e319906fd..fbb8bcf50656c97f53f1f8be47edf3f9ccbf8f5b 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-102.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-102"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
index a1e28c6c197600a286fe2d1328d54c6e579b0715..a34b034d0cd68605dcebfacf3f56ebd0494dda3d 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-103.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-103"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
index e3d45adf1ee1db2ea509f004f825edc9e4109256..9baf02efa1f53574f8fccb2e43cf7294ccef1d84 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-104.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-104"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
index d2cce5307881cc07796b432c7c6bf3810432e8b3..8d72aeaee73700c0d30b171f0f24625d0a224f53 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-105.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-105"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
index d150a74a5232d48dabbc9b7b6a4075ed8168fdc7..3cc171a045fafac13687616e4c4027bef1e28ded 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-106.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-106"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
index 28000deafbc62ff7e0a03bfa5ab405d1e55caf92..053cbd28980655e488d4c2c3cb10b6d9db4be9c2 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-107.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-107"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
index e607096dd87496dcce6f1a2e58f5272bae4ec64d..c192b74017e549063b8ff8c0b45d37a68aaf095f 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-108.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-108"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
index 2bec2e6782c70d8a14efe3160757d0ab9332ae7b..6ae4e5a0174de56712eecccf7ae715869a68415a 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-109.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-109"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
index a2d13ffaca28cfcc0c10d6cb97ea2b1b5a531086..370ba6029152b0b247488b937dfb0636bc6e81fa 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-11.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
index cc47e9c20eb0af04314e941020c265063a65891a..d91b053403965a43bdd3d649be91537790465e73 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-110.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-110"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
index a2df79033aeadb1ceba92a2bd732d0f61ee7fc9e..442a4dfea500f2ac7d36dfe05e69c231f582a9be 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-111.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-111"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
index 39bd061819a11ee295e0427096a759b182e4c871..a84a634422facbf2a5d826c3643981c93c6208dd 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-112.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-112"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json
index 4a36227e89ef7736a0547abe3c9f9ec91cb372c9..4d85ffc1b1e0d26d93f6e4abc53ef74bc060a354 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-113.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-113"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json
index 6da675e8b5c201adfe7575cb3ebe36b5eb785a28..ed04299b9a2e6512b11521efd999c472060bc490 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-114.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-114"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json
index 1cd216de2a479a8fe945d76afb8b5c8c05615e00..8430ecc7987e4a0e64d572efd9fb1047fc23b941 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-115.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-115"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json
index e618ddd07abcc94e3d3c22419c12e1bc3a8635e3..7eca09b5bf075e7acd4decb84afb14dab53efec9 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-116.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-116"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json
index e758967998f20a3e1ba6e8ba7a4e6efa274027d6..39378717cce885686e300e670dfdd61e9225c73c 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-117.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-117"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json
index 2741ef55a8f694e49958e4d2fedc5ccb712e6597..196205d42e9595b69c84b8aba01520078cc1fa9c 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-118.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-118"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json
index d55458dd7c5231495b10f5d348a7581e23da9ab1..e8c039d2287569b5dedc3e6d58af450152f028c4 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-119.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-119"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json
index 32d70615dc452d9f72a203efe5f933002d2b4ffa..dd3b31c42ba209ef1f2e313932883ebcc98bec3c 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-12.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json
index a94ea431456fc16cf303b1a68957831a2e98cd95..00db2f17ccbe91ce40054a517168d917cffed917 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-120.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-120"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json
index 10cf896fb0d63c6f533ed1936e52dc498ea6d79f..507c4b0717ba9d05610b46e97a499912f670d3c0 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-13.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json
index 3c1494973a7259b930ea4e42dba3d1e449bb86ac..5297118d10031e34dd8c70b213eae0a0f20eb5d2 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-14.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json
index 27f76d03b9d799f333820899f2f7ced315cd8c53..11ce990505d187ff8fe3babbb59f32ddb98a05f8 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-15.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json
index ff52ed7016504d866667954eab842284b8d2cd48..63d9ec478ad07daf936525b2be5cb4c50c7cbe75 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-16.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json
index 77ffc6f375fefcce14cdf6a5f20965f1e403cc9b..26d607173f8a437c2a6d2d314a13a96df61bf821 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-17.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json
index 44abb64a4f5bb11532ac5bdaf8d4269c8f5f6438..eeaca3fdcdab8ca8f84986214960fff39ba6a51d 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-18.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json
index 38b3c9b7f10819690116689059593135ce3fde71..eb7accd011dbd401ce9a233948e26720c1a10bde 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-19.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json
index 80ec20f4a1bf4783b082c5bf0091cac66ce3851d..f5fbfe161da198db77fac78e9782a345d87c6760 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-2.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json
index 4d6ee920e6a63cd0b5c3488ca208b19727dbde8d..ac654e85cad33ddcb50a12d406df6a8db7eb1351 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-20.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json
index c3274cf2d9e8ef005cfecaa9da137589c11cdc16..293e5a2988da47104b602bde30202c8942d66460 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-21.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json
index f19e8d736340219a36c8f964faeffcc42952ada4..517787701ba04a7e2844789d5e7f012890bf6888 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-22.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json
index a4fb77c4d713d684a5bcaab130a488c59f58b5e1..529625b0a2c1a1fdaff5286d79e9c92023be968c 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-23.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json
index fff72df3e4cce93369cd21e08d361dd7b6d25e84..727e61dc4573f5053b02b6b2df25d93152d92544 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-24.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json
index 4e6377801414d6f10069903e572b68d6c9957d5e..03d00df394ded8e20266aee369874035f6e06961 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-25.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json
index 76bfd3e59cbad4403d031faccbef1765db42b93e..7ee63e024ffc316ff53fecb43b7b8833e1307189 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-26.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json
index 9df90ce7f42fe4d19ac748b98f3bec1c70946f97..04b33e79055db81bc7900376530d55522c714244 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-27.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json
index 1fdfaff558afc939dd717ce124ade5b0b4160261..8571a40c5965b9bde2978839ef63338dabb55600 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-28.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json
index eb81f3e0b1a18b265c5ecd54f9d4d5e93373e0f8..e9239bd0b68c98c809ed21555cbf7b9924c88070 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-29.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json
index 6dfee5af292311dc264a764e165ffff13621b2b8..5eb4924b1165cec908e73de09c3df8f646ce73d4 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-3.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json
index 48043b8ce09b08545638572be7f0a08568d4144e..7c0ee192525196f605908332f35cf448caa190ab 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-30.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json
index 2d7950254fbb4cb6078c9b731e06084fe284df1b..376f5e01281c1e21df142c6c64891579fa0e4817 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-31.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json
index 2f1cd8c9a5c35213a44dbc426aa6794bc0c2020d..7d33fb5c960d25970060a9350fb6bef30aabe9c9 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-32.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json
index 7c7dc2e1db95e34ac993da2198336619e9eb0616..50f4b6f1d2712f300ea81b705fd2f34f46a1b32e 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-33.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json
index c762e957fbcb9423a0987bbfd94e9ef32abb96a1..29c69e6030e6a7428b86ab197612b5fdbd00176c 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-34.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json
index b11121e5766b71738c62994b15a57706d6073469..62bb58b4535e8701b95e0d117ee8b84f3f02476c 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-35.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json
index b7668e9231a2537e68641e8a185412397a4c7e74..e9086840d8eeedf51bcc19a5ce30335c0d2e3883 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-36.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json
index 0636574e8367b1673931c730234d3b2049bcd063..af6a546084d8f85d5dde143d9a529ea40a33df0c 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-37.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json
index 50a69a79bb607372e9192ae7e1405576715eb187..0c810b503c924a014b64c3a5c10d0ea305efd90f 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-38.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json
index eedb7a50e33330631a8dae4dfc51322f7d4d14fe..57f743fc14be3d5ed93c2c209dd4e681528f8fc9 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-39.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json
index eee9ccd4e1e6e0495df19542eda3b4d91ba09efe..6f0d9f4830857b85a6ad7eea8b2c1c5a0aa00ac1 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-4.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json
index 29015f8b31e7045c3fd291bec506a4822140bc88..1c07b6f68892172689491f597014a8710659b2d4 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-40.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json
index 58603cf3f0899d9544c1e8eb1b2feb0e96a92b5c..824701ecf3058cc9b8be70ba2caf8c5c1fd8a9ee 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-41.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json
index b8afc03a308bb5334a7ee3edd3caa145db01792f..5b7246608f9d4338681e716451ba33c4333f2d29 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-42.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json
index c5807a677d911f847cae85feae4f257469dd53e4..7ec1f96c900b565030236d3e4e92f4b08636da5a 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-43.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json
index 32be7788580913674b6afceddaab99b5f05279d4..400b75d97dd3c8852b9ddb331c2dd1a9e7418bb0 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-44.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json
index 472491729794396d712df82b914626c9eedf6540..c789dd9a589a8cd24127b085ffb32b967372dd1a 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-45.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json
index 2a8ed2fa98999780deae45ef8ed075e99a5746e0..ee6eae23f546b7abbff359fec71e6ad4f70323cf 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-46.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json
index 9a9a27276b5c521ef531b61b8c45ae11908d42ed..ebb6643e5e83d7107f40db61f31d9b1a0f619eac 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-47.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json
index 33b5d4ed9a10779ee3b8d095aeda5ea95b5b2a97..e270ba5655167ab0cfcb8e79132ab903e02a94a5 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-48.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json
index 6a6f5021220d68bcc40bbdc4efb291cdc8b78415..521e352efc5a93320048dde8d4d12eebc8153a7f 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-49.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json
index 2029ccf54e2783164f8b120c6eeb58ffd7e67ed0..76bc5a9ab79ba2e77cbd89065a905994dc5422ac 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-5.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json
index 677af5b9bb325bd0eae3813e72e2b3e827496e42..b3a124237b709e8b51e29651f4b9aec4e27fa53e 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-50.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json
index 29e3c5ca5d85b8728fb348d01d7dbef80e61feeb..7c7b67434a5dc07074ee26e2f79b20a844ac1da6 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-51.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json
index ae6dc5ecf053dea8fa3fd7f27d8ceefcef0c93b0..0add8c175020c731a566201d87a5d7878fd630e9 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-52.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json
index 2d289e548ab2445c9de06fc49f70fd8a9f317ebd..199177460cabe5afd75dc5f04efab8e1468fb43d 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-53.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json
index 27774d4e4474c5e875ab69cab8929a021b899cb2..5512ef265ecffe19f349511bcea4c47765eda70a 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-54.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json
index 04f72646a8816cc363f09093592336b48fcae0a0..f0832158129ade50d077a68eb294553b9f331fa2 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-55.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json
index 667f29dda8bb8251d6cfa6b76d21fbe1f55e95cb..490b28294060d58bcb087e3ca430d07cc95a9e7b 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-56.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json
index 4f0f0fc5af80b3f2ae6e255b85ca87993a9ad397..24d5bd72f150c5c342856ef40559e414bf89040a 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-57.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json
index 2be3cd1cc14c6fd52a48e85dc802ed8ef3434f49..c362e9652eb400f5d6989c5641a6a08058dafe84 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-58.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json
index a79293d65af3c8ab1b429f9dc0fa51ae3d5b38ca..246e4889466b8a14c77bb2fe309d51bbe95ba0f2 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-59.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json
index 9ae7500e148c0f90e5e8f7fe8924e1212f51aad6..621e0fd8f6912a541ac3ad8cc4cb72d98aec024e 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-6.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json
index 5eec86ad997f7c3a9be04189e9a2e7d91d43b66b..3cd3fcfe0a164078463b9f846094bd47d7ddd055 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-60.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json
index 9a62049372460f96f1afa973b2df6d2c08ad8d64..4513450c4445a01c53c91d2666b08b9676388afe 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-61.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json
index aeab6d0606b00d3b0d1475bf25bdfe717b1022d4..5f5e6ce180f4e57fa3bbd6de0c38dfc34c7ae9c6 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-62.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json
index 26209f51b70c90cd94a1abb095c70275f7cb2140..cac0c2a7aa1c65331aa6befb542e3e9dd6c26094 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-63.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json
index 6d7369e8f23c4e79f1d7354e73a3729a052a5a7f..f411e8fef1882f812c34a123106f58a9b35d782e 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-64.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json
index f9469ed7797a79f1c0a34618ec7a14ccae4ecd58..8929cf457f93adeafe76284ba43fa425fd22e75d 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-65.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json
index f91329a3745b6d067982de4020348c4cdd6d72b2..7e8c3f77aa86058f82225f8c4bcbe8c9813e4cbd 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-66.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json
index 73b32a2f8c742f862837ffd4f98b56cd373cde2c..b97f286f61864fe344d62a8ed86f18635ab62a69 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-67.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json
index 33bd4b0fb76fa1fc4aaa4a3bc8bb39dd994d988d..18574b845bf60f59fd66c2d0cb8bdf93b4b76d01 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-68.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json
index 3202af2d56328b4fe5f18c42e3a682c8891cc490..3f1cdb6a02b45ce0039fda454b02db3e45f13933 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-69.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json
index d5b89beaa167a9dbb12870d0407e2d5dfbaf4a10..b254cba44e7024d97f5837c09351d8ef4964c5c3 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-7.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json
index fb55e87468bbe7919f1ad6e95f6e4f1550a2e427..7a9791e866386ee6352157b55631adfd1c2e0570 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-70.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json
index 92a506a259bfb7161300a359bc570671fee986cb..c04102e9dd3d4f2565e4f64948176b0052c4628c 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-71.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json
index da5c06342542c8a0463379228d6163102bfd3f4e..6b0ff4accdee1447512cd2e581171781fb31ccee 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-72.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json
index 40b5a35b4f744f1e4b6a9bdd6713af6aa133f9bc..516235f3537c8ca7ae2a149c764b7ca3afb339d1 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-73.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json
index 29e3e1389f37f518510388954bc471c20c14c39d..dca20d0f1ad2e226cc2a8d928ff9b5048fdcef20 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-74.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json
index 0691278bec2731bc00cbe483bdb15fc1bf0edfe7..ae65d93dabce6b689ca96a28b0955fc9b890fd18 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-75.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json
index f30ace3acda501803ae9fad95c4ac3816303067f..6fa35f372ba9fbd3c9ab01fb59fa684c2a48992d 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-76.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json
index 497d893c4cf4d65c1834549309e23f74568309f1..7e5870c81c985a5b4d2a9242630a8328d8ffc0cd 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-77.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json
index 8e248eed081545ccf5ff7e78bee89099d45993a1..eeb4c46a9aebe2999484709f3b31023a94896ba0 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-78.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json
index 9113b0ac51af56f47aae9c576d9a21a9162a4099..5349ebcac2c52ef4344595116d496b3d7719fbb7 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-79.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json
index ccfa20b59fc609dc8450331dd3fb9577f31271e9..2cc2690755c498a223f987448b64c7e78f353e56 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-8.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json
index d104b5524768f9f2c6be9112fedabde2e5847a7b..17c04c853a82bef6fb48694e9a97a90c13cf73a2 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-80.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-80"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json
index 8bfc7d4d2ca6e2291fd6e875ed27846fe7568658..9113a8cdeeb0d15feb244426141b41ed900a714f 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-81.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-81"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json
index fbba06d83fec8d99d4b294067b81f8c2c040be13..e708f6eafbae806eecd222106da46a01b4c7adf0 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-82.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-82"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json
index 9dd60742b0f2b686e8a7e1c6462eba0e3699d147..b6d8ab8559f110bcbacc99edbfc78ff9797eeee3 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-83.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-83"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json
index c1a0f618322bfed9ac4985e351b50c3fc5b06ca8..ca7b9d9353485280af9d4b73420668a137b1304c 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-84.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-84"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json
index da16cef673fde3180bd6364daed8b3f6bd7ea3e8..94534822df788546f4daee5a4932020935b221b4 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-85.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-85"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json
index f02a71d23129fb4ad99c154e8e629e300878d1b6..1e2a7d7c9069897fd3b6bf00e9bcb4ac9fcd613b 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-86.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-86"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json
index 904c00389bfea9dc2c43940f651a84c980e48b51..1e103a3a63b6b048e695b0487600786482ae327e 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-87.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-87"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json
index b6dedd4820b25c1916a9e03b69c681163a04b28d..b76111c63d45da4a258a1b6bf12ed93ef3c2316e 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-88.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-88"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json
index 1818730e8439b3ca9fb20e9e7c5bc867f0b96202..c601f1fbd5525ed9e56343ad73fc8c37d901f84f 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-89.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-89"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json
index 8ba6ce3568e118354c3bae2c177d0e29a06d5608..32d85d772aca91db9d6df4e8ccd88a818f33b589 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-9.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json
index be1ba2c295d7d0b52082fae50ce6cab122fdf52c..3e1b6b8fb5e0a00e595af58a14f7245614ada9e3 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-90.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-90"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json
index 1d9505ad17c825d8b6a78f49d659dde9b465a81f..83ccb4f2b5048d4192fa508468b9342cbd6a3909 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-91.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-91"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json
index 0999c7b0904710de86f20e34742202a74d99fd88..94d2f41afd88bc6b023ee40aa1f4427cfce91f31 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-92.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-92"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json
index 65f68f651c1eacc33428bfeff46943ac6931087f..2658b37c01bfb3094a62d21e5498ca5532a1a1ac 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-93.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-93"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json
index cd33977ec485d258bec7c18ba9011efaf72cf556..6afe1c3ebe32f130ffabf2958efa060d4bc0e369 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-94.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-94"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json
index 17a875cbe140677d8209d0280a80d30923909d3b..6815aaf76b5a2afa074bdd87c79b28accca006ea 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-95.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-95"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json
index f31967b30f6fd6e5bad0a17f581d9a0fd08f3544..c43fc6fc991aff4dc2186b321773f47db30983f9 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-96.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-96"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json
index 1f3d4726c95e399504fd1b23dd9a7097f5d763fe..7b16c2cfa7fcb6ef6abbac36fbc8527b194ddff0 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-97.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-97"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json
index 0fe1552b0afc7ab8eb6cfd2db4abb689976ec74c..bead572c95db387a2d4f4ba97b60e51672cb44d3 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-98.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-98"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json
index 30bf3dc3c171e784bae6b19ff9b007fb29b2d9ac..2c55ed8f38090d8b12f7cc1a0875d0d23f0943cd 100644
--- a/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json
+++ b/data/grid5000/sites/nancy/clusters/grelon/nodes/grelon-99.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 4
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 1600000000.0,
-    "version": "5110",
-    "cache_l2": 4194304,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "ata_piix",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 4194304,
+    "clock_speed": 1600000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5110"
+  },
+  "storage_devices": [
+    {
+      "driver": "ata_piix",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grelon-99"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/grillon.json b/data/grid5000/sites/nancy/clusters/grillon/grillon.json
index aacae77c825bc2a60e067b8279433e9aa34f4add..3a7a99fb55b9c400e923d68613e5a2841e1f6dcb 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/grillon.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/grillon.json
@@ -1,6 +1,6 @@
 {
-  "type": "cluster",
-  "model": "HP ProLiant DL145G2",
   "date_of_arrival": 1130846400,
+  "model": "HP ProLiant DL145G2",
+  "type": "cluster",
   "uid": "grillon"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-1.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-1.json
index 2ca8220d60e988311f88e1038265f6eb6aa94e2b..6b13cf35ed32ee046ac805509da4645928b38ce1 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-1.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-1.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-10.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-10.json
index cbcbeb092b0fd5a51558f1be18004f311a512a6a..2dedde329aeba70a5ba6e2a52e9960fc43da042a 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-10.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-10.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-11.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-11.json
index 0e81b13997e3797116bcce91e1a60872a8527da1..befabe4d7f5ba81238a99c0d6b06d6fc1c83273e 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-11.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-11.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-12.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-12.json
index c84762c5a2238dfe29b3157b127d49c9fb6aaa1f..76523e5f7a6d987ddb13d9df658e6cacd232f4f4 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-12.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-12.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-13.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-13.json
index 08134c507510acb76a1d3f7017abaf3eacaca189..ce9921d3ca5a5ecbad0739fa4542f9b28e71e0c0 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-13.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-13.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-14.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-14.json
index 4ce3c761e09f1ea448bd50cbc397a5ca763e5d62..532e6a630780e6e95c6fe0e28e2eb3ee436193ee 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-14.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-14.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-15.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-15.json
index 158e2399cf86c5ba2a6b1abd458d071819452b03..f99c686cb83eb8b66a80ccc21a2728510c942726 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-15.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-15.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-16.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-16.json
index a6e5faef7415bd1ee8f7a5c82b5bb4c7b9074d7e..b7888755a4ea74ae92befc97dd55d523bb006bc0 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-16.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-16.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-17.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-17.json
index 3028fb57c2ad26a6f45796d5b2030b8f0e84818a..240d01840cd286f83f3fa2fa7ba827037550173d 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-17.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-17.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-18.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-18.json
index cbdcac4cfa8517a19c3082309589a332c5dd3c36..5671507295f79c17c217788e215e7e422fa01e08 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-18.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-18.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-19.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-19.json
index 18413548cc92e2959b26e913b44724df8e70d5ff..36623f87fd861087aa398e98fb40d7b8663252c2 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-19.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-19.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-2.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-2.json
index 50479f0af39129e4f801cd4ba9c7df8d628a2b5e..28df581d11c27fc69cc74287c674e7eebcddab74 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-2.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-2.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-20.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-20.json
index 66b342abe0e7ef5e7722e6a22526f310a3efdd2c..84fc84491dd7bc7249de2645be4fc761e26822ce 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-20.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-20.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-21.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-21.json
index 2cae29a4eebc25e2ccd34517512f2af3dd1fa64e..fd4aa4525ed2dfbf00ec53a66dfb12c88632e9a5 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-21.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-21.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-22.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-22.json
index 25ec91e6419c8498ae25283fccc93ea51fee8913..1a1907ab71646a8ba217a173b6523cf1df84254c 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-22.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-22.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-23.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-23.json
index e46671b330287a422110da2ccfbcc3c41ed5e780..6f07a2bcc37a3a1ae3756f583f962bacedf53caa 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-23.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-23.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-24.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-24.json
index 7729810646cd7b40a558333465f4b94a920c7b06..6c682da5b3ade0417e390cd21d57f9e1dd10034e 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-24.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-24.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-25.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-25.json
index 65b1425bf2aa5815db6b2dd8969e7a94d5c7f532..c1df3a5e1a69364d819367e0818ad329e0be2b51 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-25.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-25.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-26.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-26.json
index b929373f5789ee5109d07fdf957301baec02abef..52ccd2cf5061f002c08dd8b293aab22d4be19c3a 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-26.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-26.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-27.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-27.json
index db714db3803ea4c8f00050d6c665b0b3d1b75505..d226f6acec10ccd99cc770f3bb19b16d5541ed7e 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-27.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-27.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-28.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-28.json
index e7e20584e6439e74437a103f175a2ef67a58f66e..86ffce32bfd7c8bd78ce87302b9d4404d80cc733 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-28.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-28.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-29.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-29.json
index 4f4ce83484a3450ba4044ccc10e7064db1aa0a4b..e97a1069f998f526098aaca76e8b1efaeea6e696 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-29.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-29.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-3.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-3.json
index 507d7e475c383c1abe9b97ddaab89636837aa10e..a84e9d25cdb9d02b857fa024e40c3161b293b87b 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-3.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-3.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-30.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-30.json
index bbfe396e98834324f046d3cfb78fd0843a80503d..9481efbe0c7087de8fde688b6a0fe8e5c27cc91d 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-30.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-30.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-31.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-31.json
index ec2af74f1fa2696e1d4e2adf5c4b8c09036e653e..676094c134f5106b8e66fb9a4665be761535e9bf 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-31.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-31.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-32.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-32.json
index ce98de2f777be2039a3676578f32f40fd262d1e3..b01ba7cbeb6f5c9ebd01f7f1ab4e2b1ca438b639 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-32.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-32.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-33.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-33.json
index be7737c8063ddf73c2dde606d0be0d6f0af708ac..4a4d8a5c0e052b3607bbd38f36c9df3de0d0d463 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-33.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-33.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-34.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-34.json
index 94a80dfa38619831cff2d4ebfd25225d9969e341..e65d0aa043386e777b14e6ebe50b04263fd2e4bf 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-34.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-34.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-35.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-35.json
index 4901eebb2a7e93bb13d9e9749039f8a845279794..11383b55432ba80ac7fbf7bc9dde5b3430b42781 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-35.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-35.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-36.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-36.json
index 95957c934757c66320d1175f9cba0149abedabc4..ac57a1ab75c0afdd518ee8ecc6d6e9a51e51bcf9 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-36.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-36.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-37.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-37.json
index 98fd8d305da19f98651610de9101677f95a64730..ba7a734206ac69758893856875fa9043f689fef0 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-37.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-37.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-38.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-38.json
index 4ff9ae28065944c093870718a9c3a9ce10deb076..6766acd1845826e0940ca9192f9e6a87e315a20d 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-38.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-38.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-39.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-39.json
index c877e14e1371bee2377e3b56b6445c2799f0ce6f..885504adeea00d936e5c5762e8ed49593a2d25e2 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-39.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-39.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-4.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-4.json
index 195122b24914dc087923fb613e813c8122f8cf19..7da5657e279659926cddd4cab75643e6c946264e 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-4.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-4.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-40.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-40.json
index 95adeeeb1e088c88f92569aa558201e258d15518..af3cd17915144380e332b4c0635e23c99625db20 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-40.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-40.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-41.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-41.json
index 92a6286a6186c8c538ebb8c3c29420a2cdf8905c..52e1ebd67511d7e442f8c29ca759d3ce119da45c 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-41.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-41.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-42.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-42.json
index 47c29e8689fcf7fd6f61016f5142b56c4652c250..d9c22b290fd28fa3446d686d2527001451140af8 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-42.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-42.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-43.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-43.json
index a09fbfde5cdd0bf47aeb1b75decf6a414333a96c..7d99b06e6ff58cc52a5699e284391d98b93b1bc9 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-43.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-43.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-44.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-44.json
index e8dbf20eb0c6ef70a9f6f8dc40bdd8500d823e86..eb9824becc517f38bb0ee52c7bf0c7db5d861b36 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-44.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-44.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-45.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-45.json
index fa3d986df3b34011e67eba68c16eacb4aecde320..559f2df6fa97d6d9cc84e8359c2db1bc64e96991 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-45.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-45.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-46.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-46.json
index ec370fd8ac7092c070e7b0a90218f1b67159397b..9b52f9b98f21835e0b8a95820d23f6a74e03122f 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-46.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-46.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-47.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-47.json
index 0c456fd16a11917dc6257c21847bb36ef842a715..4abd296d52769f63d392f63f21c1c0af7eda643c 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-47.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-47.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-5.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-5.json
index 5c4f6fcbf54f1dadb312e945b62199b039b6f850..6fdb6ed5eea6cfc98b450a8e06236c0df9d954e9 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-5.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-5.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-6.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-6.json
index 2dc34850aaba6cf0ad214f5628c2bce3e1f6da23..e6579cdc7241c761c71210abb0b2120066b3bfd5 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-6.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-6.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-7.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-7.json
index 146df25a42da5892dc1bf89c3607a877189ec2a6..014be4659abceb94c2a5c95d6c84a59dbb776b46 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-7.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-7.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-8.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-8.json
index 6380eaac9b2597192c6500eb5ecc83c39690b2f0..3b5387969a14aea82fe9ae75351334665696ea59 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-8.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-8.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-9.json b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-9.json
index 5ec99d244ec86e000e964efa373963cfa40732b9..fcbb022ff6d042c1bd16bd1dc6da1ecddcbc93cf 100644
--- a/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-9.json
+++ b/data/grid5000/sites/nancy/clusters/grillon/nodes/grillon-9.json
@@ -4,52 +4,52 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": 1048576,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": "sata_nv",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "vendor": "Broadcom",
+      "enabled": true,
+      "interface": "Ethernet",
       "rate": 1000000000,
-      "version": "BCM5721",
-      "enabled": true
+      "vendor": "Broadcom",
+      "version": "BCM5721"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
   },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 1048576,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "grillon-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json b/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/nancy.json b/data/grid5000/sites/nancy/nancy.json
index 4af2b3e1e8a089263fecb97a429c439604affa2e..f05dd853eb4a041fab41e73d339f811ab91b5d4c 100644
--- a/data/grid5000/sites/nancy/nancy.json
+++ b/data/grid5000/sites/nancy/nancy.json
@@ -1,14 +1,14 @@
 {
-  "longitude": null,
-  "user_support_contact": null,
-  "latitude": null,
-  "security_contact": null,
-  "web": null,
   "description": "",
-  "sys_admin_contact": null,
+  "email_contact": null,
+  "latitude": null,
   "location": "Nancy, France",
+  "longitude": null,
   "name": "Nancy",
-  "email_contact": null,
+  "security_contact": null,
+  "sys_admin_contact": null,
   "type": "site",
-  "uid": "nancy"
+  "uid": "nancy",
+  "user_support_contact": null,
+  "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/gdx.json b/data/grid5000/sites/orsay/clusters/gdx/gdx.json
index 00b9cf171e66f9ada9ce45490374a090882bc7f1..3ce6b2b7a33fcb26998cb0cd3a30486bdb04c025 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/gdx.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/gdx.json
@@ -1,7 +1,7 @@
 {
-  "model": "IBM eServer 326m",
-  "type": "cluster",
   "date_of_arrival": null,
   "misc": "bios:1.28\/bcm:1.20.17\/bmc:1.10\/rsaII:1.00",
+  "model": "IBM eServer 326m",
+  "type": "cluster",
   "uid": "gdx"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
index 7855e7895f48a33701c7ef3311f60742cef2c5d7..69bc9b25632508a3293a5aef477065ee62f67592 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
index 8b77be5dd18c307305515f44a8751b215247c243..4859255bdcc1a89d367d6740ef6aef352f9b31fe 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
index 7fc0175e6d263fa8ea41d257cbd52781d8a260d8..adec1e5561ef386e8dbe21096915fc041640a46f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-100"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
index b6a4980e26d46f2de59a7a65d70bb332b1ab10e2..2c7609e052b0bfcc2138291c7bcf58a214936da3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-101"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
index e24d7f45dbeea16a061d3ec0924a6513911e0158..ad117d951f6f647823d24a6c571a16c46b9e018f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-102"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
index 0c2ac2b4fadaaf3bf1b85e82dad058385919a90d..f23a0a55d1f04e8e84363b286707df6c095c4dea 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-103"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
index 15be6f8330b26237737848d4a04f38a8db65a557..b27f34ad1b344f31f756b908e4ce273e0128075f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-104"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
index 00ecf1bc716b802c47ccb0eca42e60252008c450..e6f21780721fc97bef66c8f89dcd189f200db7a6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-105"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
index 0c5153ad55cf7f64cb9e91720f0e4b0509823ea9..7d1d39f7fb35fb0902e59612d234b39fd29596b9 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-106"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
index b346cdb6148b5191fd860f15d8a69a0d88fa2cac..522b5fc8a787d37ae0542cc91275f1116ddb8e0a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-107"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
index 4187a4769d2a8fea2f3540f1847a891ff224bc50..e5333e57736f7a7d73219184881b480a34b04771 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-108"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
index 49c460eb69ab72f1ba36c40c7f5cc78a69699949..15a1413c17fa0f2f2e7d55333712189c7e53f78c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-109"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
index 916ee606e0483e43ce146334c4e3c1b236c3af10..f5bef2e4d8a7c3971022b17c79fdee282116989b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
index 2160b29747fc8837de5935cb576e6f63601d2e08..4e837ba476c6cf938ac4d19fab37ed0b1c16229a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-110"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
index 8c25a040fd1e03d17accee27895287708820f610..79de49c3af0d3f37eb31afb110beaed7da3ba0a6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-111"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
index a3f3938837dd282a3683212abc03acd5f5b3eeb9..3dd82f7e45871cfa14b888b27bbdfd92e0c02f30 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-112"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
index 92b1ec28e5858b5b972616dc0bfeb9274e697526..db2567319e3defb6785e519c53c7a0ca1948653e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-113"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
index 1f8fbb789587865dd25b9826db5d6df4af481110..6d3517b41943427260f9df1af1a33367a1c4c29d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-114"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
index 189720e1c4a40053cd98347bf006573ffcaf4d63..b63d66864e267dcbb3b54124452be5408fd01ca3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-115"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
index 2513c5b113af2486a7639af8aed13e169570db52..5a7dc18c08f1710663636f7319779b648d28563e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-116"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
index b42614f48e3589c4c5c9c9dde2e1495994362920..34e1017fb7ab399dcecb9f9c5e340563eb41767c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-117"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
index 9ade45d50b5f2f72a094e369b425f9e4162e3c6f..34a73a2a48b1f1380f03c4fed52d5ea35b99e81d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-118"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
index 5cc143050adb812a4fe980bc4f24c8e5549155d9..3b8f106ea473f826e463e7e78b7773a69cee13b5 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-119"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
index f642627c151967edb0457ebdd35187174ca157f2..565339ef5d0ea2357147bd61a6417247663e4b05 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
index 3eb2c5e823d40914c6b46fa2dfc5293b638ea290..5e10916a28f13e6fd6653e4e52a49199ae8c6440 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-120"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
index 2da660bd8386c4ddb250e5f6209f554142ac98b8..c9be8a57e56e3d46b4c71ba96f3c81869584e6ff 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-121"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
index aed9ab1a09ddbb9f4dac11d1db54b86a79542aeb..4c0d283a859ad15fbd2d2007fd6a40fe2952fa1f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-122"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
index 2a0da6567da39cf30815c560125ff8232bbd8676..46a34a585af87a6fbc970cf2868d874b087024b2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-123"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
index 052436e88245f536f2974fd69a527b1edee98a04..9557d9a3221d1e04e2b850c238c7086b50231f22 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-124"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
index 9f511a74d395f8ba14d0acb5cf6e0dd121f03ce4..cb6db2f2f586e9e14d6795cd00a2b4e434867419 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-125"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
index 31be0aed19849a8dfb903405ab821e50c9453afa..cb255d3c23be1cd0b71b7ac8bd9e081e71015b2b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-126"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
index cd0fe1401cd0d6db7fce754beff0554e6961310c..99c8891114c8140623a9235d97881ea02fe7ab6b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-127"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
index 3cd30013f852753ecadb44923ecd8c5544cdc81e..c31bb8a160c42c3a4656b884c454095acb2a7ba7 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-128"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
index 9199999e45b86478f161ca9c3256d4215987275b..f3563751542e7818e0349797f3a8bf5bc13afad8 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-129"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
index 5d27f2f7da80e7b1f2f82e6bc010142c111933f0..91c3d2821de0f8e3ee749c7bd48d5252f58d1ebb 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
index b850d6dd15ee7f42014f93ae563a551dd5174447..976b5376ab1725d3a9934ea3386c370d97bfe14a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-130"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
index faad8d6c4040c3fcc5a9b24dcc7506b2ecc58fe1..780f674a0f39ab53eff4d8d89aa1beede7dcb8bf 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-131"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
index 8fb07ff25ad5b9866e2d1bd314aa88d6d23b695b..859ce100c2bf8e4650be5dd560ff142574ca944d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-132"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
index a997d9273130a1c147066fdcc237fb33b37b5bb4..2061495cd95f19a63184d7fcedd7675f69abba92 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-133"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
index e023cf4b266f7ee8201c0f9b7a8cf9ef1eeb9159..2c49d14b03f7591cb62419907a72625291ccc860 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-134"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
index a50efa43f6a7e105f4f4bb939f0b1a726756fcb5..0b58dd542213886d439bd0c4fcca7fe43db68f62 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-135"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
index ef97b9d52853d4a7518d34ff0fcdf0d8996524cc..5e688d83e208a2762d76f9ba6476593fd1d4ba77 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-136"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
index ae467c25eb745ea614b1c6e46a0fa7d9b508cd5a..fa3ccf6d19cfaee5bede76c6cfeda56c4882ae36 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-137"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
index 2ddd58a9006637e5811f72d5362c7cf888a4c4be..d99f5dbe90fd7cc2172c60051c5e55a58dd1fff3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-138"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
index d9cfc06797ded5ca7b1650c2c67d4f90fcab2705..44f951f0fecf614f9ca25eea2f0766e53fae2df0 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-139"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
index 64b2588d81c9b43c67354b3c054ea9fa8855f408..93dcdb1bd345ce14aaf58d7c2774e494e611c8fa 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
index e42ceb851672d0cb067d94326543c4d4b8c3b6d6..71139783d0ebf010fc7c6cef87348b06b0c6a503 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-140"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
index 876a86b74f22e9d74e325238eb6ab7d209f1b3eb..c299d83a8dfe12ac071c311952ad3ef3e575361c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-141"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
index b59143ed53cd97eed9927dfd66727c6a28dd61f0..32c63a47ec93491738d7dd089c1c4b0fdc25e5cf 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-142"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
index ff7d9a52464e45386dc5c1475b423f4dada7409c..78d437444908734f8e36c1483efc72b5849e66ba 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-143"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
index 5e91e098fa16f3f51edd98c31caf33de9010f2a1..7ca006887b0c0d1bcb127920bbab00866f89cf8e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-144"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
index e87d3dc6a5c86bfb4546eb6593174ff205d88edb..84d85f8657194d84a7cb16feefb75ebabdeba515 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-145"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
index 60631fd38bab302793747b82761110e0079f6af3..273d093068ab3ab724c034508411d235e22734f1 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-146"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
index e801e2b30d8164d40336666207daf207afe1972b..ab76ec4b188009909ce54069ac37eefe59ed16b3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-147"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
index 048a5778d313c979f403400be3ff08486df0c4af..e475b27608da62eb199f223f80d537a31160c9a6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-148"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
index 0ea7179cf59ace60c227095246b2dcf78d2ee26d..2f45e4745f8e5181e8cfc4c5dc57b8e4982e4078 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-149"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
index c9bb8c97be39481c3e5d62e09b3565f044887c0b..d657598bf9967a065a5106b96babdbffd5df7571 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
index 0b156385bae1a053a2b09010740e1296c92aca39..b25bf497a194e88c4fb284a965e95a2d318bfdd0 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-150"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
index 6630580aa4552a6d72336983fb6bb0f60d30032f..9558157d0ad6f91ef402124b44cf64e619b117c0 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-151"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
index 44b85c615590b34decc46e7bedc883d5b31bcc3a..757f80053f8a124aa46fa2b58decdb336cd78173 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-152"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
index 3488748ee85e97a4fd9f0541bc89ec04f5f31087..5e241dfc42513214babf891709c780b84b20f04c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-153"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
index 62125279ef7e9d632a035a9bd52bbcdba9b79fa4..8762e49ac5ce72910d45656bfeddcb413b263d9f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-154"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
index 8e9352036501c0c9f84e15a5b9d72b144a53f3a9..97d66a3ca63d4450bb734a4e7bbfa17f64537dc3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-155"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
index 5c2df4cc06a3b2b5141c8d151b449b6abe74b0a6..102ce491bf352a458e71d21efb939f1761f47aaa 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-156"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
index b853a7179597a3cac5064f5aabe1195863b4bf02..7743514a605b5a9dc3d3667c3aadf1d9ea3e1a93 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-157"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
index def0ed537466b67a6b9e9bb81135acd30a2053a6..5d1d5e186e66fc12eaa5c502ceaebbc90699e9a7 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-158"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
index 9ac8c4887a7451735788402b2fb9b0004e69feca..4418dd1ce2b02e69503316c010822895c69f2d64 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-159"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
index 2bd83ccc4efe5673cc0a0661d39c1c3a7f1c0465..54ae67dc22a96f26d09ebb236ab276239db08582 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
index 17533894e96e9330d8c14ba3781a61f729c838f1..df0b4be804752407dab0d11a1b98df1cf63745e0 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-160"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
index ed75fef7ea2e9e5c773123344ceebe5d1075ce3e..0055fa8237b399df0622d63114f0633f42ec9da0 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-161"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
index ced730e47d2ff630132b35380a55e5d48737dff9..31a622f036d1a757a90c6e52781b3e61a900ce31 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-162"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
index 4a643a1a6ac185b180075fa269bff8e574f912ac..7cf7c00160df8d22bd13055649e5bb04102bfb4d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-163"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
index 2c8f0459ff19e2f86762a61ca09e51e22e020874..80e83beb8a6dc95e376fa06e10339caa20b8d364 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-164"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
index 069258b6e0efb1245b988dd70f9b9e92d223ead6..ac1dd55080895db4efcf06a8846049b2556ed86d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-165"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
index 50358571e2e7841edc6fec19e594ffd5a6b09a40..7e796dd57eba5c854636ce7b0cb009ce037a091c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-166"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
index 870435c7df2a6c297404a449e18cac18381187a7..d35413311bf4c7a9cad413fda48b6c32b5e3648e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-167"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
index d3e9adf44a47c82f31b96979c9c1fec78971dae2..9d8254d6d44c5f7927b4db7b3fe45a0a9e157df8 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-168"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
index 3a517225a2bd69f31f2e2833862945b8bb3749ff..b8e20b5f64f1faf2f768fb38839c606703e79eae 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-169"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
index 73308a51f364e4ce7173cffe79f335848f5677a4..73e19929d73120079e4fd1f68b4b087516239cd3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
index fcac8882f334d6773c48e0363623b4c004ccac1d..c9f938114d1a9cb302b24313d959422ded2f9d61 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-170"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
index 59f7ffc38631cee0917d382de855e3a66b2bd0cb..d70101c5e6caf50198af8d4c31cecb6f33821c07 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-171"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
index 8c5724d14ede497182e17aa85060b11001e4cb0c..9d92079ae212f2cf41f51648b2a04cb0a6d5b980 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-172"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
index d754920cc7c04d884bfe8eddfe64d5644e858ce4..537651a92f8e8c2511bcf0859832b701efbe07cb 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-173"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
index db4d4c33679a52576d56942a75f91752c060bed9..bd5fccabd1b7460137876667feb7b81b11a2dbaa 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-174"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
index 6e004ae6f34b1d40cec8e24e7934af1b3323a12d..e3d0e605f6bad1384a611b9bd50b23b1e4d590e8 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-175"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
index 4deb2c647838f795aa91f08281b05c28284b429e..c4adf787ab2d24886ff1adc489cf28dc915b487a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-176"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
index 644dd1b36b13d28eee0ca3ed5c3bd51a9f8b0516..c2e3dd48471898516b852f7e05743979c6f1a411 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-177"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
index 531dcf16c70217030159c9a3c4b65c3afbd82a9d..52f47f72b90c6aeca63270ba23e3efa6c1070d65 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-178"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
index 29439f594a645482fb518449df44af5a54aa6732..9c2401fe92a2a49c973cd852d10c62d297fae0ee 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-179"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
index 79da9a73f00128c1dec182a6818bd85937edc58c..8453f2c80758bf4cfd8d57f371df04db9a2294a2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
index d7fa000d06a0cb37109abdbfe635033697e14686..ffa3fdf1cd9abc13c41befd2f4cbc1fea677d4d2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-180"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
index 3905e8ecc3793732447ff9fa09ce6a8780da10eb..ae7c612f23b6ee0ca04f32b9de355cc56d13b3a5 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-181"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
index f12e7a63f0d32edddf512231a8318edf2ad41158..4daf453f4716ddb49575fb8ca7e53817c418f259 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-182"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
index 531cc077b7cf6342a52f324ab48855565bbaa8fc..7e96f1c6c88832328b6c6b03a390363e2499877c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-183"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
index 56dfa95c77a04267d72778a16212821e69cf944b..b264c49529769b3ea58277789c9254f435b89c29 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-184"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
index ad626cafc20aa090ac68ae9ca719f2b2bc42a7b2..ea9fd1d23240cf97a0dff9de4c5ea4c76e133bf6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-185"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
index b95f4c32d0aa27314cf2a35a2deb4c23f281722c..8d46b7709dc2071224ee59d4c9dca6648e3f71c0 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-186"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
index c7a91bd4c447d9e21cd72d6b59e46e6dab01074d..0e8bcaff870de3fd52c5256dbba099a2142dfe7f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-187"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
index 1963805ed64b57d13f2312d2a540f48abc7cdacb..c62e70806f30f5b43d26f036dac7251262f5c945 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-188"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
index 63c1c3b34acd406740984948ba63f85245df4956..fefb959b63b56214eb139930b0be273252d2cb9e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-189"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
index de1d807be719d09a06ca9e7238469ce65f60c9b9..c36a2c0d763c9aee731906e792c3bb9aa2bebabb 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
index 6f29d50078783a3319eac4a2b30449068d37d1a7..1014973044473b92cd02162915ca07cfe886a8b3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-190"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
index 638a2369f4c6a617e1e11d566933c5e93f0e44c8..9911fb9f9129bd489774362a244018b1e3e2b3e5 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-191"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
index 0942f286e4cb71273bb31dc708b2a6aa4da4f398..d83a32b53d354508bf7e4291366dc9e61a68bcaf 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-192"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
index fb0b8cb4c0926c3aff7fa2ac83ba04ed2c5022b4..b668d704a5026660276d9eebb8a1f638fa088325 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-193"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
index d1b6b6bbc702093492c97e02aaa8e5d9f75de015..606e38a576638c97e3020bb6436af6c32517022d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-194"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
index 656c008d905143929ab07d50088e851c39ae3c03..47198e33e62bd72c866820e4d9588fe70f475e97 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-195"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
index d0063b90a05e70b6a86108663e37080618117ca9..8064529ad25dbdfc77230daef5a26395b8b197f2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-196"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
index 2f1c6261eeea54b012cc526956ebd78ddc81933e..7aeef9a0c98d310a28207c3f857837387ef9dce7 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-197"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
index 36b1df6fe9e3090d4ee491ec52c430e2824719ab..413dbf9a102b99930b3ba1cc5266c2ff6347ad48 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-198"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
index ff74df812654f2a7425a9da640f4221807413a25..ebf3a13e6158323dce4d58845ba44a8f0334f585 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-199"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
index 79abfedece0d60a5de0d87bc9a522a401fe8a3eb..b9cd6a974ca7369e642fac26d0501ac9df611772 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
index ef2f816fc98f2058299e93149e135bddab593d5b..0512733516d47cc78b260a169016e2c85e885931 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
index 7c41dd19aa07a463bb97e9dc95f1ae8d2ff79639..2d910b490f0541811ff521daf7fd9b9b95a87b78 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-200"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
index b0542c2721511ef74199d7ef3ce59704addbabf3..531cef34707f8c240a5d314e28eca44e334493f8 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-201"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
index 057c57130b04b8c2c1b41a823def673ecd68bf2b..09bdd22ebb0f41df5d1e906b0673a67e9c2577eb 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-202"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
index b40fe88bfc6e39cafb526ae8372e7363befef112..0155b2b1588d1999576abdb4a9a3dfe1b88ffe01 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-203"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
index 89feb233522c683c29a886cfe9e9702c1199182c..f6361faa6cf4df474ddb0122e34cd444b0bad96e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-204"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
index 2292330409cf50023cb2113364816a63b4a10d77..bdb3f5e45ca3729489ee0f62d1ae89cd7cc51520 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-205"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
index e186a621c079bf12f733349149139bfd28e4cbf0..29c9684efbda0e3198a3d74473216573f89b5517 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-206"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
index 0a8079871f1ebab4eef178a5b6b4af81f0fd7a39..f4084656395dc1c5dc5808313da40a485e065469 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-207"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
index 575fe0a28e123489aa5fc51aa4f859d907b527ef..ba0a38149d5018ed406abc8b1bb1efe960efe7a8 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-208"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
index 894b399581a80fcb1e602addcea5bbf35d30e69c..77f2f0d8778970c8dc598efd6c2ccfc3ddd50bff 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-209"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
index 02c6dc411ddb4115d9d693ca4b6de09f570f6661..c9429dde76cf94a618d1b7b429877557135c2626 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
index 8b7b5c56a27609d5cc081dd2009a651d8f7cd07e..28396653c6d8289ee26a9d60b79813d350f8541d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-210"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
index b726555bad78ac31ba75747bf05206f9e56e20dc..d82d853671136122ee6f5315dda28282c3571f2f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-211"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
index de6cd2f0c369d4cee5b339bcdf61b6e2563444ae..91b8bdb7478d22e9d10e18a75d29f4f4cabc5813 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-212"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
index bd9c1af1c0a0460817ec98ff812fcb278b01a69c..31fa228bb8876cfb70b0a7d70c257653d68d5457 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-213"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
index ce0f8781c68517aa96e691e532a409626393defb..e1e28124813711a8c28fcc85a429af2998a32b17 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-214"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
index ce296433376b975503a8337f3a46d25f4b320908..76ee6676354016533e50e37529c777de1ee27a36 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-215"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
index a7b754880f30ca779f6a552857330b3f0d257d52..c3784fa0cdfb33ffc1ce7816f546beda9aa553f3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-216"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
index 70e7e57fb4769a84bd7ed735c36f5898d194f6fd..2299c0f965738b2a4afc3e6c3cc7a2229bd807ec 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-217"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
index 803de7c503897a3d566520c27a46b6e7ec80010f..d06bba3139b899a7dd7d3a95298ff3344fa3b0fa 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-218"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
index 9845486d00c5e15a48eafbd8afeed4e80228b53f..989a0bc77eead796457772247c138a480e82c107 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-219"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
index 2677c2ad04b13783f476837bf29b70a91e34bd4f..85538816b95f4e074725dab0ffff897ec8c80c70 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
index 0e9cb2bb3b9e6e4642604f52102bcbca4c061d43..81ab7eb03913c7df0ff289f6e49ebbb495f8ee0f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-220"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
index 8fec31bbdcbf4ebb088406476d5e457b5c16e317..ef728e6587bce098f6cb93a012d1b29c7b62e090 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-221"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
index 65c473684f196cb87c1aebe6f3a5964b625c3828..7514632b4e404d7cde9d49d454473cba198b5579 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-222"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
index 3ca1ab875837362be84871e7f28acc1aae587a9e..3bb4292b1b76626932e28bb9911605e20f835cad 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-223"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
index 053289dfe0cee60d4ab4c51570f380ce0f4f6ef2..a85ed657850530caaf965d8e864b7e74f6815e81 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-224"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
index 099b1ec478e47a9c898513b944b6a6a50336a03c..c6c09fda2c67c1bffd8783dddd59b2481f7dcea2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-225"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
index 3516a598c07d20eb416bf84ee1fa14845fa9914b..2feb2b9ec3ac7fefc5f90d4abe3a2628328f6c7e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-226"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
index 1311a626220637551718663bfef574ee1e4e1728..6308f3f3e618ae609111ac3a2fad95165a1a781a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-227"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
index 4e3013de284fa9527780d7e686c9bdd622681095..3afdf9a65a79578854d7dcf002671ff6ab12fd20 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-228"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
index eeb1f8e94711c04768820f9aa2f9f280d761c486..af1eff32a9af09c2c7b19bf5daa9e2f409b8c73f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-229"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
index 4457192a4a69b4b7b13fe58ad7d2b48f77dcecde..192aa045333d53a9caf97f9b344e69254bc0d91a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
index 0f44ca3aa865f3ab8bb78d1abe633d7511ab5361..4462b090dc66f5c17dde40d77e58adfcfadfbd90 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-230"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
index 06790c76ebf2aad2e40e5888ed77de42eef6e925..866c4eb0a6310d512a9229885422d4546bc67857 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-231"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
index 6e5538bf999b7cb5e83f67d947e88f2b895fc362..5dfffdbe64276f8a4dda220cf613b40f9728de3c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-232"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
index b4d07d45e88bf704e9eea7a8ad4121e37caac011..73128a10138d7efac110f85366cea264b8ec5737 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-233"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
index 64736454579800a080e7da95cbcf96b185d2eff1..18fae3980d5c7bb7e4a42f66361b754af6b24300 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-234"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
index ff30c25123d4c2d2c125ee62ee17da0e692e5000..9626489cfa5a03f9c4e738466d18e3507550609c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-235"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
index 6b7737ffd2c594227a64596124354ad7c8b0cb06..83c63ef3e8379ee1618ada92b3c5b51eefa82d5b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-236"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
index 023951da2bb4dc57104acad45773c30d3ec0ea00..7c989526428db95864946125dec3c03473d08964 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-237"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
index 96b3889c42a3fb1aa1aa5ce141136c455e15d6c4..d8cb5bb77be0a6d16374630ee0bbfa23a152d132 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-238"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
index 4f354d14f1a0d535c5ad470ec298aca44aab12a2..266691958975856d98d9d7da33411dc8600ce0fd 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-239"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
index cc7e480cf3a6614f774ca3ccc9f9ff1a30427ba5..6821bd152d4b7c2df3f5ed3366134508a36398e8 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
index 3d3c27053fb28afcdd085b1ae2185dc3a56f8674..a21dbeb2b159732e081614687e1e20fa40fea21d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-240"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
index 174b70e78ef1252adfbd48204a21e40652eb3c62..09e33006b8a7e12fb14a7502c127b3aa1d9252b6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-241"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
index 49cfd84a22badfcac277b78918a0fdb7954e406d..9a8075c880dfd0a5583bb8e344cc1edf95fd65d5 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-242"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
index 322379a12fd142a919eb6388b07fef50b3d8be72..d9153348ff05383b7b62d7ed16dcc79f80885c2e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-243"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
index 79bd098de4d4c1a7d70a4feac3f19de3fc18f3be..c8416f1a56938777c73424d69d885198f4d43c62 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-244"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
index bf111388a58277399271c3dbba79be910dd28d70..1faac8e3394dbf14edc17dad3686e1fed5bbc25b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-245"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
index 11323923c986bc729bccb73a86c403d7266817cd..76cab5ece3f014e3ce412a4c0751c8a91800f45e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-246"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
index 23e1f993f68ba237e658cd74cbb2abe3700e81e3..c10e951d04560f04a93464dd795dffabbe28cd55 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-247"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
index 9ba6a13d7f012e4408bc3f39e9c55ba054e52940..91d0467fd4508e9e0d8cbed48437d455fa6ed059 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-248"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
index 99538b9b7d3147769e45ccabc5ba20fc0db169b8..d0b2d9af9386b8f0c375867f2358cf4b765dc3b4 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-249"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
index 4f2c239477a08cf54833ca8f9bbf18c8aaa944ce..91dcf6245ce3c68067ce01b231b82b9aca700038 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
index 62226bdc455ae8d5a87b3384ff7285304ee53216..96eb9bc78c57aad6ec78e530b9be33d3b29cc462 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-250"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
index e6035a8f3fa8782c12172bbb770ac3b27ea86f7c..246135e50b168231f37f43e44906dc369382196e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-251"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
index d918ee15c0e167cfd497baeb6cbee9d4fb7599cd..f9bdf33178c575b4ef874d370a4748abc673e2e1 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-252"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
index 47bde203bab5c84d1f4653f06f428ada72abe114..cf8d61765e7f3e4de181516889005ddf2ecfb615 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-253"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
index a0a2336458c01e3d19e05b97f0616b51d04fdce6..570e66535f8205b0fbc9a424f63e1661d7530e39 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-254"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
index 50e32cc62be8f2836181fe4543ec9142ff3c8935..038558e84223da89178fa77a88c592b4db3601b6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-255"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
index e20a3d9e67774de2cca17d9bd66a450cbcd69dec..3b1c72ec1c986e763cc20c5f69b8a6769d6eef8a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-256"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
index a25699fbfd21dea8eb53c737d29043ebc0458798..acf009f4f55a8285529f0688de69921e291d064c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-257"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
index 28fb33fcdaa658e2d4840404e10037420f450373..9a2b9cf4cc7acb5bffd87aa594009f1b27358bef 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-258"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
index 986dcc1710b378640bce69db433cd4b3223083f2..3ef68b9662c63bf022ebc3b6741b674331d0823f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-259"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
index 4ed73067e2e233f9cb59999826e50e3ec4db73d4..2da37cb44500a0b5f05fde0ff052e3944090616a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
index 1452c2c87901f40482eb64768b65d5d276da6635..877dbaf84e0ed40f9a2679c0201e528e0962f3f4 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-260"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
index cd015ffb2b538a482a31e45e7e084dedc8a91073..6f93e5cf2a7136585c841459982b1d3778ad8bd4 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-261"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
index da1322344d60fc722961b324ac33c44f61ab21b2..d3203708645f7dbc9e7ffad2d1978b6edeb7fd51 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-262"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
index 4593136585d15dd56126793295d16ce92efe6f57..f545e761d3d71bf2733d64ce511c76e6e6268c7b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-263"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
index e65ff2e6af63dde63dffa625732b66c175245869..40a63e85a5b4a29ad67f25edc6693d0b8165e028 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-264"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
index 03c28f54c1e62666f49d35112138baeed99659ec..08903df6c4c31c3e4b0dacc2a4d3df71384e01ee 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-265"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
index 67e1b935e01e798b8d77cfff0b1dfd903d66275a..f381e0988e1c3cd8a48e8cde58216ddf714ce647 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-266"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
index 07b97e2dd288ca74387e0bb17e32e58797bf25ef..ae112e85372a02c32d9363a36ffc7bf85f68f0d4 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-267"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
index d2858f1add7922de0b5a89f7a43982bc5aa56545..4fc9a4607f47b760be1ec4842cc3558fe4c937e2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-268"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
index d12b194d599654e4e71249d278066c4519685b30..2d6808215aa8150fefeed0d3e0ca3165ba0b93c7 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-269"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
index 0e657f06b3797603e8d8b63fa16f4820672058b7..9f6ccf84256d38b335b90ac12b1a28d8b4c80be7 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
index e63ff86ac32b8785f2b5145a8853e7eb73bac369..73546c295a5adb3516cf77a6520d20d651871f60 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-270"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
index 2958aa71a268cdc0849290f9127772395bfb7e2c..88238f983d38713ebd37e200b0eb860997bf24c9 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-271"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
index 1ec7ae68c52271880d8c320afdf8e2e124b973ca..9361d16c32c1ed87393f5d655fc273ee7467970a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-272"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
index 7fd7693b4fc1587e28bd270e7e1a096e79eef527..19b87343bfa0bab17ad450fd3d66a8f09e865d8e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-273"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
index f07a0142f750ffb1f4f3044c0c2769471a3f94fc..d7e3a600f3579a557ed1d638558235622a79f521 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-274"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
index 264f8dc250ba000e6659f329ce214b34e0d0a52a..651467b747f07ded04727b1c087ad9b00451abf1 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-275"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
index 113df308259fa2b115cfc471e7e72ac347a5830a..ab4aeb6023ca4f008b605d417c90e39b964f285c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-276"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
index 357d42cd9d3ebb7f2111baa380876fcdc30bb18d..41e800078e4ecf82959df8363291168c0e095ae0 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-277"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
index 29cdd471cb06a0b50b291aa0e503d3d7436a6cf7..f60e2e5dff7576e8b6d09744fd9828f0a9bae77b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-278"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
index 16686156dcedaac220392d4ac20c7b3515d3308a..aa708d1f5520527233d14fa4b98ef0ef90c5b091 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-279"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
index c6a9e8c487aadd5a086576c5a8a46b0bc2c749a6..9d9ad535c75caa27f506a211b5a0fc97eeee525b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
index ac4cd67fd01e99b3a814df4133a17dc7bb41cff7..11d7115b5440b667bd990f198b08d60a7b48cab1 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-280"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
index b61b3e297f282b5deefbd7102b4325a10f2649cc..cf2286d3f1bff668b311152700fdda26ff846fa3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-281"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
index 556b696a05f4d15700d96df0fa492486bff45c9c..041ccfa6285fe4f159dd015a68950f45d40bfae2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-282"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
index 392fb067a10d20d218ad87adf71b6d41910094f8..c6f58bc8aa4ab314a74c7802a3b431990c998b9a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-283"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
index e4dbc6abf3b3cf3d42f8b5728937b30a0c6e113b..9a1612d8a30e76a696d1bc988d092ec115c03e15 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-284"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
index ccb7c1c2d7d856bf4cc8b2574904767810404bab..85f03213ddd89e50269b0c0e32c7bca68c0102de 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-285"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
index 70cf8b765a127d69423f3f402b9c099360f95ee6..23517b7cf88f093c1adb12b96d0523b08456a62a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-286"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
index 2cf793ba467a01cf49811d8b2dab15e486fa407d..20c616ccd0dd8f04989a8163f21ac5bd831988c4 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-287"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
index c1dad71ecae1530b7a16ad53713afbaa6e9de8fb..73404015e8643fe2b537f04b97e6665532b60ce1 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-288"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index 3841c30d02ce7db4cfcda30ba486e0560753d46a..7935b327a46a2ed3542fbaf3029ae251fe8e3346 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-289"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
index 021601f33a68f1d49efcaf530671e5e9eea32c54..dabc954d87a8103e1f47e3ac85738c7e8454bccd 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
index 7a377ece9bde3989bf7fed24de187831b6f64107..d04cd6e8cd85da3a845c145eddcf46a88a126912 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-290"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index c655412d3342dc42f01f41664c102f00c190b27a..37f6336f0666a67c0834798da6570dbb37734234 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-291"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index e3e20daca52546babb70b2e7064c976f10317a98..0f052b4d2ae06050e69450710a581e6a38c1e9dd 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-292"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index c63ae9d1371cf3c127680a1c0b71dd71140da442..8ebffc1bae44130347244f99f3639c92f1299a29 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-293"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index 2b95687a4a60e0bc462b2b26a215b7f268d03368..e154147be5f150e304add519d2ab6167187ff16f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-294"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index 39db0c642eff88957d64f7ad07e920a2bc253aea..fd486876b571735588311b621cd89934ca074e5e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-295"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index 69db8ba897aac539b429e196896ca8ea323dcbfa..7ba63d37aa77425f31685330ace81a8b70b80480 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-296"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index 1a043572f4dc5a189820e261dad0ed17d2d3b723..bd5ac9373092e77479796a23ca97f3691c22b6aa 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-297"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
index 2abeaa63aee831e7cf0b4f9494735e7cf70a61e1..4bc63d0242ef5253d4ce1cac92a70f24aeefa855 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-298"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
index a3ac4fd90c8f63553b877bfaf14438bc2f037ee1..db17008c517d28ead8b372053c9e7b282c6a88f9 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-299"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
index ceb5b849018fd9a53c522f6eb8340c07858941a7..7291902817e956ee09465e6fcd492a71d6a10d23 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
index 7c4a63ab9be514732657e3716685c48350086bae..d9de9fd6f7d27ec21ceb070498a6cda13024f7f4 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
index 5438aae8b6645bb00583feaec96a3b698f53230d..01dbf38938e61aafa3eced2a0e71f2145a838aa0 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-300"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
index dd40b2545a9fdffac9619cca1bd32799d30aa46b..d7978ab2794e56e13686f2fd97cd35aabdb9142e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-301"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
index 8ac8df72036771fdc8af4195661d81beaf232fda..bc1331868c0d559678d654eaa0b81bedac1c1d0e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-302"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
index c7a70791e07859ccd143792b907d158bd02af147..8e4ea2b731754a10687c9244145d488d69b8456c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-303"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
index 16e12138a0cf98bbc06ea6e4b1e1d717e2d49ee8..45b8420ffb854921d8a86c529fe24e31b288e7a2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-304"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
index b7a4960e8d22601eb6c4622a44d52d28e6d21382..91292f4132c0169d1359641e3376fa02c29d6823 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-305"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index ffb45985d9bc26796846471d7608e0b72cb63734..5549dcfacf2e1d14b802c66fd171bc91875f67ba 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-306"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
index 2e30f6c92b371b543cfbe9869b84f2c43812934e..6155406e2a8983f14342847aad128e62053a33e1 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-307"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
index 84e3a7496dc70b467d3eac9988d9e31c46969f55..6422ca9e9f40d3e9dc97ebb29fcb15b26706d6bf 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-308"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
index 445840713084083d37f9ae780345754a03ac35cf..2d6195303773515a0d25eee7c2be858c49efae52 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-309"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
index 01561c34f80584fbab9950bd6110af929c963615..0d69a3595fca5a9a382e8955440f55003954bddb 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
index 5b1fc2d3d3ab7abce92a3e358259d02b46fa4671..6c1c1f8c8f9bd7e16543015471d3db129e852dca 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-310"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-311.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-311.json
index 026ba4594ccdce8c4b06e81bb8a3db63a96cbef3..72945a6568ce7206c223c6d521dca43198773911 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-311.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-311.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-311"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-312.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-312.json
index 997c5975d4fb3cc7da9851148c2d62e1f77540f4..060dfe38acbe3425356371fe80a1861071ac1305 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-312.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-312.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "250",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2400000000.0,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "250"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-312"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
index 06ade1c629387e7de401c7b28270756632090871..4bc8dd9537ad42e2e9a9a4b35d4ef61d449a3435 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
index 31c2255a3c4f85d6aed60d9c6f7c5a697904a3b6..a0755651ba859fd42869204aeb081d216bee8c37 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
index 0f0927d7eff99ae830cdf2827c1e5753dc3ecf0e..0a0251a742bc6af6435b008eec824b5c96e76678 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
index 6bc46b81bf632adcad55686f78381ad4f4fc17be..488e1fb8c62398eeef00ad33c099587505619acb 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
index e2399ff3221a549d3a9717b36c95867407e0d6a0..11b2ddf23f1e6f0d49faf9aeedef36f3dd94cfe2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
index 1213f91fcb6b2117723c8d81c017680210e9eed0..ede86b9ec771949013560fe08a28c2a0ab9a26e9 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
index dbcd581098ab8b175c0591ecbfb930ceb04dee6a..779cab0bc3ace16a153dda5a30f9afdb06dd09d2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
index e9b928bdb132ed4d1a35946275ac54fe69da387c..0cf9a25bf70a548212260a7b26425eaeb1046834 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
index 692c4c56e1a7354ce541b931fab2a9fd0f488c87..99a7d4c5b6e94311c79b13cf655605585fff6f6b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
index 7cfdbead92440135135ca97f4119167a30e0db0c..3d4a7a42b20c941975023cdefeedbcb56ec50e0c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
index 0066388ad97435b59afe7b26a554c4be2665209a..a00b1cadf677081ca74a53817a0d1e88607cb894 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
index 211295de639fdf9e0ce1ef6ffc1e99278cee4e6c..f70cbf1cd70cbb0f5aa7d4b682e3eb2f776bff1e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
index 71fa4e7771c6b6f909dded56a83148334ffdc504..ba0da41a4a44729a40751e67378eab820406b189 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
index be9071efd358e130dcdd62081842df12b24df315..d8815ecf7e42011fdf6ec3003d1c9d8ef7378f6f 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
index 00158a92c49b824bad019c9622d72e93d9c5a338..56489c336af47341c3fa56bd2511387705d1b70b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
index d07012bb4d0892c12325a14ef277750c756661b0..f587a1db5c1a2178dbb8652a685806b6aff067b6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
index 8f501cb12f3de8dd0a0de6c281e96bfbc52bff8c..1b9872407907455d4b83e0df61a03712d808418e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
index 1bf9670845411e9d17767b5080eed46708deca6b..4b7d77bcfbd16f43755b860b66fffaf15ff07d64 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
index 0b7a99662b3490359f3781988fe9d6ce6da9c6ba..b636206aec3b11b7702c8d69f1f40d9c6f339b8c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
index 91f06d3a4ef96af2588c6ecc5151ce8aea4e1f3a..6922d0e166366036b2c60134b6e56294d38d479a 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
index 9cd4833514b473d9b99c8bc5485f942f1da476e1..9e7b49f8d2235195eb00cc77826f01386e51e64e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
index c5a515e6d88c51b4d220887237495f6099dfa0ed..3d189b374d25246ead5824de203e3fbdb217c5f6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
index 693a4131eeacd7b82ecaec5ec200d34f045a6e2f..fbdbd890d29e55951669a839220b836582e32168 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
index 1f87cc1b98e6169226acf96b8947dfa5bf3050a3..b9cf35643075396306118abc6c4385d4effa239e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
index 3bb8f6e62233649dd0d916eece25a9d08eff01e7..14136ffbe71914102e9743cba68247c40ad4deaa 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
index 76f39d897503bc455c8292b593d59e771d13ff94..eefb9bd76cb27c978b72eff214690ab44a944b9e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
index a83d538fe6c4c87be1a4fec366039d9cf23ce923..27807b05e5a2e796fe70149981ee22b58bc60146 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
index 049b85a74f74d9139701298f7ff62fbcd620bfc5..6dbde8bcc4b1dce237ec669037a225e1467ee19e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
index 2be08ae03da138812eb9bcaa4f21c967d80ef91d..552507dd53214be4151a433315aebc0e82041a3b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
index 0ead482ef864b4d7bed6b78a4627097131179729..5ec73108dbfddd9f7655245166653ba028c03fb2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
index 4589799159e0ab3cf6a529c68a916ee33df8df27..9a199f6de51ba3c62dac7a97cdcdf184551fa5ab 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
index 01af08b0da25b31d0e53d613a2962f6621012527..16baf3194c083f0e38ec4c1f6e377dfb1c163dd3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
index d9eb4212a53986cb2a18ade0d1d7f29b19452f96..a0a380bc312f5d2d05d40f95783332d60c6c45b5 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
index 21e041fcecc57d5e177598de7f43018d31821957..b49bf5d00594cc1471903322bf4d3d2c9b0c39b7 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
index 587584c9176978ce4854332c97a5a3a92b13e871..d371ac7090f210a8350f1ea47cd793b27fe2d209 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
index fa6db8dc2aed4b3869084dcd3a978286be43b75f..58b75db086543303f38fbd38db6dbf860d7908f6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
index aabf9cefa85474a87e6d67a4ecf53fc6bf1e38be..d2c8f3b8339211fd07da1df4f194be184ff5078b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
index 46ec93e42b2bad77bdfa4d0bc117ed207567a9fc..247a0fc10fb2badf60871039ad34edd334ec24fa 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
index e396d2cb931380bd30f4318d86c43c27d4710fa0..fa6554ba61158ab9ad06b159dfeaf10156867fd5 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
index f6829a66616507c23b4d17e10dc7385581ad170b..f660af271e8e212785060d80ed1f3bb8240628ef 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
index 078c1dd36ea7d8aecd59d7ab2607f48f06d1ff84..7b2b1af8efd460c1fba78f176422b03933cf8fb2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
index cc9a198fe30e2bd1fa269cc4156dfc872ec51a7a..0ffb3e22b7230e184d8c53641b0ed2637f9bc60d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
index 166c0dd7d04bc23b78993e5f38f837a0e43c8358..bea2fee0691aaedfb5e7b006e3eb50ecd57ccb6e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
index 4fc297c9bf190e24f1e1534ae85fc069b3fb01dc..9014361a52ee081d15362f2a732b874a38794887 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
index 3ab9c8b531656211f9c5aece2c0ed702120f36ae..d8e5e2227942dba7c943f77e0e9f202c915f13e6 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
index ece2ab83fab80fb916579b1cd97ffb8309889072..d48a918581d5828062fe56a80a1a69a6861f9dad 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
index b9928770c8a34621439fb0da4059f41488b59f70..f6bc9a9bf9eb9026d79f57e3b77f5e98fe99d990 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
index 82eea0f661e9e07dbf4d69307b9dd923ad0551d7..025bec83f7c50aa67253f00c6c8395ce303836cf 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
index b9cf5938f2bfe1e7f177b71e8eb2a3eb90894402..16405a2458f1e6d1554b93847ff677c13f159dd2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
index 8ad7e173cce8e667be999a4ab1a6fcc2b55249d5..dca3da7d38a46b8baca9659425a6889d868e92ff 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
index b036f216253a7e71cfd093d23fb1b83338719167..87b26400f529b9ef45874fcc96c52c159579ac5c 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
index 9c58142d04a4c1aca226bb6651f4d9c6cfc2bc9a..f1abde010e913796065b3c8a21eb078665869fd3 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
index 6f6309ffe9066c1374b3911381613106757fdb03..4b93b5643dc6b4122b2c4c104c39146698c49016 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
index 90f2f956868aa1a9b249c196097cf1a9058f2af9..1e3824b1b7254aef03704e31ec8d79a8fb1695ff 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-80"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
index b3c2858daa4afb07306f1685404b91df0df35e10..219067f702502a0dbfcbce5c274824bfaaffddae 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-81"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
index bec17d82f0ec93f5aad74caf414708ee9ae96d1b..e988053e33d601f127402f20becdf38a3877c943 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-82"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
index 1ed1eedae712797b6580893a2fada072265e9a9d..d061f9bfe8c8c7882a11c1fbf1a419f7fe28cd53 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-83"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
index aff7d55166e42dd8f78e0d05b153b51ebf494b72..41dd77915e75d7f5e9621530feef10a41e91da1e 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-84"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
index c5c9b2eadafc6f6bee6247f2f7d7fb7e6ba81fe9..524d71018467757a6c0e23d74d1489837065e969 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-85"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
index 36761c38747c737c742fef32e273b02d3e8caf6d..65f7c0ec2702063767c1da993ea473133931d3e7 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-86"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
index 96bd9b5103df8ea74fc1174ba445ad1284f30d0e..7c4cdfc8c76992941f8661b45c10fc931656df36 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-87"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
index 9512b45f08c7dbeeb16f95d3d05d6e7760f6f0e3..5413c6636ffe33d2ad6f39bb770e7941a4159a29 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-88"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
index b88e478d8f72f5a170125b1858dcc49e21014b11..2b4e583ef719f5aa6e471f476ff26caae7e3bbb9 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-89"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
index c7661b55ad6c0917511f5e12dbe549c264049f9a..2fbadaf5afd901cebb55efe27feb5e033a819a74 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
index 7574c70bfabf2af025e0cab52156c1be55dea762..eb52f14c0a92331c0501a079870f7d91caba116b 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-90"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
index 06a613986dd1e7590f82a4cfcc30f89d32f0b176..dd9acda211ca4caa5a7f9c8aea3fd569a735f867 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-91"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
index bb43817d9041afc110d24ee01a0aba3cddfc89ed..bbf014426104693f16b17893de61226b99e56d5d 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-92"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
index 3e060cdfd31076027843ce94f8629e7d1c13ec2d..06328e5f149bb2a878475fd1d44ea12ba1c2de62 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-93"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
index 29bebc7a0a35d39caec37d77f351055b9401f90c..031cdc1196aff8ab503b466ef45253edb6ff9532 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-94"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
index 3fdb2a8b1219698179d765fc67209949cd074537..265e55e96214674303a9d818786ccb3c65720de2 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-95"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
index 56977782b06c36790b89e757595dc1f42aac1ce0..caf9c6a69d6ecdde0230eff70d552ce00efba2cb 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-96"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
index 0f1cbad08ebcaf38f48d429c6b02b714a957b121..bb5ce7fa0ee91d6c77bfd589b7579c473c18b2b0 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-97"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
index 8f6127744eb3d964a29ed75be483638247eb039a..75c3f4e7ef58f877183358553226a62d7d536633 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-98"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
index fe688bbe3a0ff2ba128192eb95274ba058dd275f..d82efb4191afcfa9d0e0746d26253be1236505bb 100644
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
@@ -4,53 +4,53 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": true
+      "rate": 1000000000
     },
     {
+      "enabled": false,
       "interface": "Ethernet",
-      "rate": 1000000000,
-      "enabled": false
+      "rate": 1000000000
     },
     {
+      "enabled": true,
       "interface": "Myri-10G",
-      "version": "10G-PCIE-8A-C",
-      "vendor": "Myrinet",
       "rate": 10000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "gdx-99"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/netgdx.json b/data/grid5000/sites/orsay/clusters/netgdx/netgdx.json
index 010180b5190104aff1295999db1fec6666874322..703ec0a9ca144c134741e300c6cfa6a9c7a5b89d 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/netgdx.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/netgdx.json
@@ -1,7 +1,7 @@
 {
-  "model": "IBM eServer 326m",
-  "type": "cluster",
   "date_of_arrival": null,
   "misc": "bios:1.28\/bcm:1.20.17\/bmc:1.10\/rsaII:1.00",
+  "model": "IBM eServer 326m",
+  "type": "cluster",
   "uid": "netgdx"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
index 2332f03ebd8c58fdc5d11c4e87620291daf0c4e6..6d77b773bbc72d44afe4a20f7dd0b44a70e1568b 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
index ded40f946c16f3edd574787cf071e7bedfcdfa57..cf8f471ee9c143626a00c222fadbca44d21e6569 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
index 7be465e3829c29a958c174bb4dd089d1e5ddf420..a8db98148e3099727994423bb648ca5dfd8fd1ba 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
index 722ec321de25a45c381782d48839c3362258f99e..701bdc4ec68485ed8d7d5f9a1352364a974d72c6 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
index 3382f5d25042e1081ac083a09046d5cdaecac760..6a9c4f2bb8513d50bd4f80ed142ebd546d71fa13 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
index 79cbcbd169b7e92a63910c8e6baa384fdf5f81de..9821dc3ae57b13ffb4f63d6f02b27279dae90d67 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
index 33b2e16f71111014746068c57cdbcf171c45ed72..20c7d08cc7911b293cb6118f7e59b5e1e37566bf 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
index 43aaf8ea1e41cbd38aa61d39e95fa0f9c4006d25..a6b09cd8c633a3baf08a7b8e68d03c8017f6d2bf 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
index dc7ae8f2f1f8bf2660ea342d33001d2217143f9b..251a792b5361e1d3ee9255b4a2a8c020db4f6f45 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
index 0747c2d5e80ec28e657b2a42f5004e8892e5596f..d86ca8a2171774da105398d73fe2cbcff9d775ef 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
index 32ba4427c635848d40b9658a26a12dbe315dd1f4..b26b7ebc23d5c573a2e312d5fc3d7da6cc73eba5 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
index 30ea770133d7371c0c3dfa6be48ef95512a2d255..39d1465f2cd0aa38c095cd2ef8a9e99ae75639cc 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
index 5dc1edd20bf1bb4594d6ad5c1b8c93049c3313fc..370e1b46ab1cc3023370cc49d98272b2f9481a70 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
index 912c89d3fd1b270926bd4009bb91d2a27c6264bf..6ba2f8b2b77b55ea2cab3c1ca476a773cb183cc5 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
index 0f452ed175a961628360d89e2119c5c88b5c8d27..a19df2a9e85c65e28d7c090b72b82ed0ae4c8b79 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
index 5aedcf7761a4ed0970214be65f63cc7e818b0dfd..7b9d6416fcf3aebc141640bf6116fd1b16606512 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
index f9dc7b69e21e4c64bbbe8b0df50c4ef8a5ae6e0d..fedeae5d29e36810ffefd7dcef14a3282afdf46a 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
index 52d6eec3554e9ea5dfbe2d7c78ebade092b03e4d..734dbc42069b3ba5c20212aa4e8bebcaf29a5346 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
index 16b510c12baf75c50b3be8b3ae1295b70f0d0627..0757eddb9238128be1194ab642c12dfcc09ac4b6 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
index 373b5d767995d56db15d44651431d225661067a9..5ccdb53a0802298c4b091163ac2d8ec6f5f6bf72 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
index 6ea7ff0aed33a8d605078af6a76281eb022b2de5..b83aa7728b11607a2e7fdee43c6c78fb548d19a5 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
index c1b91bc6ed6267126b9b61e8852694c9de44a1fc..c87ed43e299bed9b19039ee0fcbea949183cd083 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
index 0412990274c5367f1fef7098865446bc41d9fbf1..a4131ee516a0b56be2f5de71d59f30f810a552a5 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
index 70eeef9a5032368c72c528e76512996c82645f25..7ff93d0616f1736598521d7498ba91c4875cfe5f 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
index a48d3ea3ad84f842619f21c2a6263c7619e99351..840d7db34a0eb89261bb85ec7d9a36957786d13f 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
index dd656c5b9ba5bc0e8b8465bf565fa87a20e056b9..950e1aacc95985f3e129ba1a232e3d44a71fc4ba 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
index cf29326351056d82d3819c7e1abc5a5a1270977f..8125badbc7aba97fd0f38e5b464b80a3fb07fe22 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
index 15e1b4fef85dba14710f50de424dff66190167b7..a8cf802aea8f149d5be23282523010a9a9192f64 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
index f8d5be33623650d4e84aeec3153a4f04daf61588..750ecbe406d64818e36a6e144f875d6f7c8e3f24 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
index 1faf617ac8d67abb8bfb7462300c5c6890d13539..ccc153cc3a30a6680858a4fb371976a89180fb27 100644
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
@@ -4,54 +4,54 @@
     "smp_size": 2,
     "smt_size": 2
   },
-  "processor": {
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": 1048576,
-    "cache_l1i": null,
-    "version": "246",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "cache_l2": null,
-    "instruction_set": ""
-  },
-  "storage_devices": [
-    {
-      "interface": "SATA",
-      "driver": null,
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": null,
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
+  "storage_devices": [
+    {
+      "driver": null,
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
   "type": "node",
   "uid": "netgdx-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json b/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/orsay.json b/data/grid5000/sites/orsay/orsay.json
index 745d45d875c1004aa13e5b907cc8c5bb961f41cd..68f07b7266c816800d05660787ba2f23d7559c34 100644
--- a/data/grid5000/sites/orsay/orsay.json
+++ b/data/grid5000/sites/orsay/orsay.json
@@ -1,14 +1,14 @@
 {
+  "description": "",
   "email_contact": null,
-  "longitude": null,
-  "user_support_contact": null,
   "latitude": null,
-  "security_contact": null,
-  "web": null,
-  "description": "",
+  "location": "Orsay, France",
+  "longitude": null,
   "name": "Orsay",
+  "security_contact": null,
   "sys_admin_contact": null,
   "type": "site",
   "uid": "orsay",
-  "location": "Orsay, France"
+  "user_support_contact": null,
+  "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json
index 7b0bbb0f91c2c7d0235c71b67a4c9b46779fca5a..d6438d266254300b3afcc5324dd637ed8d193ff3 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-1",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json
index 14565e887478034be95c74e8bf60859617f6c641..c028caf11aae63901bb1177ca24e7a37fae9b55d 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-10",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json
index a43fb06aae9b087a348c400603339e3be2c6a418..67af240191d160185326c531b236b0fb2c8a10c0 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-11",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json
index a4e07271299255f03e94e45e95bc59bce16aa5ff..b1426157c9bcd052a7ed6b147ca43ff82fc10509 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-12",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json
index 94c58deca2ca191be3270bc104aaab7cf45f4c5a..1ab069c0fab10e355bd191c39fad4661f27270d9 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-13",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json
index 81c3fad1004c8a6e7e50dca6f700445ef606f6e6..b3b124357bdb58f721831729ca3b8588c1761298 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-14",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json
index 6435ed46923c261bec7ab56b8302d33ff7e57f2a..42f55991d94dcb72c9805c7918d7c112726a1644 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-15",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json
index 7e00e6da4c8c4f170032a0bc873d6c4c4c0ac056..60fba6eede8ab6bde42c6adf4d2b166e40c24462 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-16",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json
index 88cec56aa83a276b43ee751eaba37c2b40850be1..7959b68e3257b6462967e0c007c73f7a7384a338 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-17",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json
index 897e6830e6a5a1bbad5509be89c2bc0dc62c991a..1b1068658d8784bcfe997cded5c9993c4d8128f9 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-18",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json
index 7d566be66c63e50664a102fd0851cd56174264ee..4255c50b27dfac6ba1f96e394a3a00aa6dbd979c 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-19",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json
index d4ae6f80a2c904b478041605db9ba36fd28c9e64..1f2253bd894322b166e2a04982bcd9f275f3b1f6 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-2",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json
index 264beb1aab96c00b9d4894c5c6d777a10c13affd..7f356b0d6a23ae6bdca18727321863d8aab00364 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-20",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json
index e311c281aa32415acd00e7e760bc8c33ca90163a..a1cd92d964e7a268a95440ef9f3f9e1b7a63da33 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-21",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json
index 49238e1c9e846374cc2922c93b663ce19f000b5e..160d46c40223e63328202b301e4ec585b0ec1fc5 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-22",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json
index 44f2e39d8236758d6b6e469ba208dd6736880587..9d7642d7a42d444186ab9ccbe00c564c922b2458 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-23",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json
index d714d3a45c6467c0f1b2009552a5ca6f01e302f3..2141f160f16fd06f1516c12df45746e8094f6739 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-24",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json
index 151f3e63d4f59499ab4ffe501e35c5a0e277bef9..f8ab710e0a6592f444d48ce63ae91ed221b8c482 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-25",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json
index 18a63770470b3dfa2fb494e9167881887b8e17d7..4958db5b46aeb3c62093469de31d6375a6f9e03d 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-26",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json
index 45e1d57baeb4fb1ba155d0e5e5ea3aae0f61adca..5aab64d1b503711ea0280e434f51ccb0a1e956cb 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-27",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json
index 9747ea3a555c6ad8aeaac01a9d8ca42230509132..685a110f57b42b875b5dd2cd0e57ef605f542d8b 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-28",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json
index 5a7ba2368124d70dff4c7dd67c781d341e2fcacb..ee96b967b7e1b9fca1997a3266ee7baf126468b9 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-29",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json
index 334d9c29ba49d9757ee6580b08065ee37a5ea0cf..cb8dc3e3fba38d0df7f6ee1ef1e74e93822ba9c4 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-3",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json
index 3896f6132c0eaaacb45074410ea4d4c4ba337280..6700a8cfae0914bbab3674c05c95737a47b72490 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-30",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json
index fb50f756e9b6ee73c80548f22557247269117814..167923efa5b51dfffa7503c1abee1ba3866d520c 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-31",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json
index 83c91859ac3a12995dc4c00ba1e44c12f9e90d3d..beeef97385a3d5448b643b404ec4a9dd27c64cb0 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-32",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json
index 01cdd089bc17ef995644e769af1af95b3b05d1f5..5653856123c23e052f8a0f31f3ede321a9f779bc 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-33",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json
index c64c57d981f99bcac6c2449840766952bd61f9f8..aed351eaa8caf420e013d1dbc6a44d44768c3697 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-4",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json
index 83bf65d0786003e1cba7e7b3d522056817d9d944..6f08f3b30ec961c9b26f49c284f24eb36ac636a6 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-5",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json
index ad1d4e657ae2cc07f44c0eccddb63a50e39b9491..67b5a741f262a2132d7c41aca1329683b7140142 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-6",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json
index 4454ac8272553c30638c1b3c370b7ff978ed27c2..d10a9d3ecab216d59bfdadc9bad41923cf6602c7 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-7",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json
index 70d4b5668783ef915740043505136efe9ff234d0..9afb588ad4b4ebaa9a1cd5878694638cf9e1c534 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-8",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json
index 42cfaf17fc7c2ca59110cf282485d2efa50bd8b5..8f08b46ae60e69308d27f2bdf8e1fa613f699152 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json
@@ -1,63 +1,63 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "enabled": true,
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    },
+    {
+      "enabled": false,
+      "interface": "Ethernet",
+      "rate": 1000000000
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
     "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2330000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
   },
   "storage_devices": [
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     },
     {
       "driver": "megaraid_sas",
-      "size": 279396772384.644,
       "interface": "SATA",
-      "raid": "0"
+      "raid": "0",
+      "size": 279396772384.644
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
-  },
   "type": "node",
-  "uid": "paramount-9",
-  "network_adapters": [
-    {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
-      "enabled": true,
-      "interface": "Myri-10G"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": true,
-      "interface": "Ethernet"
-    },
-    {
-      "rate": 1000000000,
-      "enabled": false,
-      "interface": "Ethernet"
-    }
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "paramount-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paramount/paramount.json b/data/grid5000/sites/rennes/clusters/paramount/paramount.json
index 6e3874452146280fe4fedd7b394b88de658f0218..5ed36e03d734a380f4e1dbc6f66862db7f3df400 100644
--- a/data/grid5000/sites/rennes/clusters/paramount/paramount.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/paramount.json
@@ -1,6 +1,6 @@
 {
+  "created_at": 1188597600,
   "model": "Dell PowerEdge 1950",
   "type": "cluster",
-  "created_at": 1188597600,
   "uid": "paramount"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-1.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-1.json
index 49fab99cc397e1c6f2c701f5c855a69555bf64b4..b404038c776c86348178aaf557cf9bfd3e593382 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-1.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-1.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-1",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-10.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-10.json
index 91434fd6a3928c0096704672c368d9ae4ece5f47..1d1386628d90976eef6a4c20c199a7ddb8f4ec92 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-10.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-10.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-10",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-11.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-11.json
index ac8987599eab0561dca90e683d251c38f55bb194..55c2a3ad635d02e7fc4b7a295a0498db3f13a7e6 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-11.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-11.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-11",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-12.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-12.json
index e81a31596e7d196155302a8d5dcc166a49ed17a9..a75f6e5aae279d6acb8551fb01e329bf838146b8 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-12.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-12.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-12",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-13.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-13.json
index 4521f7f86cde0c2953e9bfe207213efff2da3cb0..74534019de6019dc7ee17e5425be93e3464202aa 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-13.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-13.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-13",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-14.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-14.json
index 0a3e42fbe5b66ca74bc537c7e050f29eaba4e7e9..dfdd58bc46cf327ac9d0b64c28c8bdcf498a49a8 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-14.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-14.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-14",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-15.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-15.json
index 9467e84ab8152909596655cbcc05bcf1fd2e6cb0..889ee2a33e094f9812d7f095c7fc611a70c87eea 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-15.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-15.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-15",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-16.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-16.json
index 3f55685b9fa0f3fee78452545e51e68ef2455a9b..03e812301aad5950ae111bb9ef9f4f0679b6b360 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-16.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-16.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-16",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-17.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-17.json
index dc79d8e45cd0ba88f36d66eb1cd030d08285c4d6..4540bee1e07f7d8a3a868ec058928cb6e2aaf762 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-17.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-17.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-17",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-18.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-18.json
index 602cddd73e91b7d3d3be900e12f170fa02093a48..c23ba4cb1cb4a7bb5d03f2f9d0c6599e04dc15ff 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-18.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-18.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-18",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-19.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-19.json
index 742fa41f78a64d00ca80e4f7e20593211d77a423..30511fa70fcd29de2519dc977a678898e39d3888 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-19.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-19.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-19",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-2.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-2.json
index 31f10289201f7aaf68bf538a9bd6f8079fdeab48..6c7f00a8fe07aa016bd5783e251cc4407e11c1b8 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-2.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-2.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-2",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-20.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-20.json
index 94404d67e1740d7d4e3d3cc68ac37c31db65de1e..7443a33f0302b3588ef0d6ba4e91a96a963daae1 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-20.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-20.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-20",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-21.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-21.json
index a728d80c512b5a6a0b7f819c2c91d9780e390867..0e195a40a06e90cd8e1e0a91da808c51d968f4a7 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-21.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-21.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-21",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-22.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-22.json
index 978efec4676ce5c66a37a8a1accbc26266ab68a8..f0bd9e6818eb4a96401e68e8a3827cb3e73ba8c0 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-22.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-22.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-22",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-23.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-23.json
index 2202d504106c5ae3c20cc60cd7b6b06adf7d915d..d04a07ffab70f765b4d1498f3d7a832cccd690ec 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-23.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-23.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-23",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-24.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-24.json
index 893b5b868cd652dfb5b9c190adfa7e9ef7e98736..18cd982463433be1e825a9a23be43a18e4c8d357 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-24.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-24.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-24",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-25.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-25.json
index d3165a9b5010d444f06d2045988685d480fdb654..a63465812317da4c9b4abc96a0afb1dfb66c0af4 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-25.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-25.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-25",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-26.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-26.json
index 55e6ab5129a8c24c7e8ab8af0085be7743a0e9f6..8656176455a2d2e4a2191b6471b7c1b6a3033dd9 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-26.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-26.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-26",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-27.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-27.json
index b5b24914753ec99220fb7bbb1bbab16ba2054cbf..fae043a0db08596b0fa7a637daad048106f21bc7 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-27.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-27.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-27",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-28.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-28.json
index ae2cb304c98ce9b12943a7fe30a2fbd441bbd8f2..546e7ed0dfa5a0b0a976764a54c8436d505dbefa 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-28.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-28.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-28",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-29.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-29.json
index 2371f6316afb73d115580f3264345fee85707bbb..d7fb49792fb8777a17c179d9220fbff4523ecde8 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-29.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-29.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-29",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-3.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-3.json
index e125ec5dc4f7b1d20322b696b6aad8642a4fef1e..3881381a1247beb01729cd4df67dad8bc108394c 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-3.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-3.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-3",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-30.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-30.json
index 650d5db5e2c726e9482f5517138aa24c0b971f17..3bcfa40b6fca2cf83dfdb1e51a8c99339c7e69fa 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-30.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-30.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-30",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-31.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-31.json
index 144a84877d33afd0917b2887d9cabce672d88d30..b34463f1a857c369508e7ff043b4e32642dbc8b3 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-31.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-31.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-31",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-32.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-32.json
index 816fc9038b999e18e0d567b639158bf62a8ddc07..6bbc3de02cbf743150ba23d2515d4af67e059c9f 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-32.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-32.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-32",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-33.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-33.json
index e0af75c3351ae2871b5e5365e28c8f18042dcad5..3a2715d76a7815f2e80a96523f939a3604fc6ec8 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-33.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-33.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-33",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-34.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-34.json
index 4eb152c1e623821b2f594eb85f5827ea44203aec..a6a451a1e05e683b53ee1c72f59774e5d2fd8117 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-34.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-34.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-34",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-35.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-35.json
index 617080432f6fa51ff940c2b1fce7de5a85617eb4..593b66973cb621c2e5c8ba9e2658bc2a5b2a8366 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-35.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-35.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-35",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-36.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-36.json
index d6f30531960c80693a01b1ba841040f8d2518fed..82a4a9b2f73f424075b1f85808f20b3ddc817cb9 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-36.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-36.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-36",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-37.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-37.json
index c566a197ff6f1c6d4f3f4cb0391a58bd94da09d5..4545f330dbc3795165462a2dbdd829a5c5ef1d2d 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-37.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-37.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-37",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-38.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-38.json
index b08650731ad01be73e5425f63cbe456a53aa5a13..83c018f67954c154abc449f7be5e23f5b888e0f7 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-38.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-38.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-38",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-39.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-39.json
index 5ac72b87a2758a286bc14b9f23d8dd2ea301063c..dad028af6660a942d1255e42693524be5f370965 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-39.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-39.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-39",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-4.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-4.json
index 18f18bd32b97f565093c43a3395226739fe6c6d6..5c17c922ea8eddbb6debce7b66abc26e3f86abef 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-4.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-4.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-4",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-40.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-40.json
index f90f7ff8cea81b28bcdcb84136839cb93b1cb2ed..5e5904a52b3ef3f0e04d7ebade30b823dba4fd8f 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-40.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-40.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-40",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-41.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-41.json
index d8b898ad1f9635922ec077cb7f804784563fbd0c..43d4162d5ac7db4bbddeeb1094f2d5ad89010c3a 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-41.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-41.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-41",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-42.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-42.json
index 2c0ce9175db441406d8910d5b38c07dac3a41957..234bb5a7ab0555f4f473d138fa9f8cff718d6e8c 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-42.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-42.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-42",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-43.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-43.json
index 99fe72388a8c2dd6a2dace27fc845d7f5f786dcd..23288e1fa0c489c4e3be1eaa3486cef929db8492 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-43.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-43.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-43",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-44.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-44.json
index 44ee2ae8b89a1e66e1e05d9413c156d08270f1c0..48d7cfcb080c09997c30bc5966f0e74b9db08fb9 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-44.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-44.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-44",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-45.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-45.json
index e860df1f077d5f6fe7d3521726bb9b493637d0cf..e5c43658612b64979886b6224ebf62ae39b5401a 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-45.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-45.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-45",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-46.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-46.json
index 03a82b92e8bb76d0674943d4b61873bdd0c73e1e..2ea52a88686d4473923a10b822d9178914430166 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-46.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-46.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-46",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-47.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-47.json
index 0cb10731367524414a3cf87cbd9a600b52e51f00..a6c1fd4d0148f929b0ded3aead631bfb9bc4b6cc 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-47.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-47.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-47",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-48.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-48.json
index 8d31c0c4d78874570ae14e7269bb4539844d8484..93e08e5be0269e5398e6d1cb05ece52b5efcb471 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-48.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-48.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-48",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-49.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-49.json
index b0147268a3bc850eefa2710dd810a007767a78ee..1f3f59cc3dd148e4f9da718a80f3359f656dca21 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-49.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-49.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-49",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-5.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-5.json
index 1a70b277ce0a6051e2e8da4f9ef43961a56b5ca6..9a25dba815adcc0b26427e501b9fca167a934f1a 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-5.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-5.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-5",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-50.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-50.json
index e54f8fe8e63d4a059e3e7583419cf1d934c547ff..f638d1721ed7731ba677e63177e6c9136c6f9821 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-50.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-50.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-50",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-51.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-51.json
index bb0c489350821dcc973506616efae11d3781b692..47952d5750f5aa9ff119e8026dd4d6500dcd8283 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-51.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-51.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-51",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-52.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-52.json
index 24543e7d82388d8b34655bde815cda50345ed03f..f8cb012d3fcb242706c4e328fd50a596c07c3aa0 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-52.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-52.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-52",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-53.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-53.json
index 613fd42c0cc3385af48e06c2eb54750a1a3664a8..497bb4757efbd9f45fc932c7a5765f226b90ca89 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-53.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-53.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-53",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-54.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-54.json
index a674b064617bcc5859c0a208d891835eef159576..fae6c45b1688e3b6195c7c63712fe57c95e79f96 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-54.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-54.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-54",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-55.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-55.json
index c6176d194bc0603cc793e4b2fd214718a919c26b..8d5c240b3a67baa01191658d875f5a1552b2ff4f 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-55.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-55.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-55",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-56.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-56.json
index aaf2ae3ac77a7c8865290f879be366aa93784a88..a491c80ffa80fd85debc255bb697fdb39f44a531 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-56.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-56.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-56",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-57.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-57.json
index 240f2a8258cfe53d170ff2e4adb34c9009f34039..183cd57dd37b624506fb9d728fc3a34720cbc2d8 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-57.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-57.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-57",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-58.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-58.json
index 18d11f295c2e6c2f1e7d6316bc858bd264d5d971..cf8f6a3e200297cd6fd2f4374e65fb0d3387d5a5 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-58.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-58.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-58",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-59.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-59.json
index 258d36f4c144f4f28ae7fbf16181940b7e4fe710..ecf61215305e452f4deada889a9fe46ee6cf7760 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-59.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-59.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-59",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-6.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-6.json
index 6a3664300ab0968ed10827e86704d1a7e7173531..b2106baeb7244c1dc1fc74a827b04f9d801b2f4d 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-6.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-6.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-6",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-60.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-60.json
index 5c6cc7a9e8c0299d591c622f8a165526b93ad4a0..d32bc28232bb113451974c3bf0b70ad02b657ca3 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-60.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-60.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-60",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-61.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-61.json
index dedca9f16e1c467b1471869bc388f24425c8a41f..ed3a8d5a47dbba81189f6f0bced8ee24b2497b2d 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-61.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-61.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-61",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-62.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-62.json
index 13da0f25ba8bc83c86d7c510bc816e18708aa1fe..c926e82a890ba8e766d5bfe8de3e97e4066f0129 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-62.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-62.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-62",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-63.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-63.json
index d7938aad1ee77c21494b24482b2162ef710cc7c5..5bfdc03b778cf997bcb7482d6a850814acbaf600 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-63.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-63.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-63",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-64.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-64.json
index 727902d169b67cd5b9f361681232d53a76210b11..9113be1e61ba47a931ee52635fc18ee551de7457 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-64.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-64.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-64",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-7.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-7.json
index 43952deda177953b0647b62d857e9bfd16d1aafe..aeffa757ceda59c03381382e63f30fdb41290093 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-7.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-7.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-7",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-8.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-8.json
index feb9669e06ac5dbc674519ea898aaf9abdce83c8..37f77c945a2aaf5e824f399cfc8090b0d4bc43ce 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-8.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-8.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-8",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-9.json b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-9.json
index 0d40f2773f767b43fab62e0bab0481e23a881ce9..42d198623020304a20b27a803c20ae0e06dadcc2 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-9.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/nodes/paraquad-9.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "Intel Xeon",
-    "cache_l1i": null,
-    "vendor": "Intel",
-    "cache_l1d": null,
-    "clock_speed": 2330000000.0,
-    "version": "5148 LV",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptsas",
-      "size": 149011611938.477,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paraquad-9",
   "network_adapters": [
     {
-      "vendor": "Myrinet",
-      "rate": 10000000000,
-      "version": "10G-PCIE-8A-C",
       "enabled": true,
-      "interface": "Myri-10G"
+      "interface": "Myri-10G",
+      "rate": 10000000000,
+      "vendor": "Myrinet",
+      "version": "10G-PCIE-8A-C"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2330000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "5148 LV"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "size": 149011611938.477
+    }
+  ],
+  "type": "node",
+  "uid": "paraquad-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paraquad/paraquad.json b/data/grid5000/sites/rennes/clusters/paraquad/paraquad.json
index ba9813e0dd5f7e0304a54410260fb181cc236caf..c16666644c641faf7e59b2e966299328dce24a28 100644
--- a/data/grid5000/sites/rennes/clusters/paraquad/paraquad.json
+++ b/data/grid5000/sites/rennes/clusters/paraquad/paraquad.json
@@ -1,6 +1,6 @@
 {
+  "created_at": 1164927600,
   "model": "Dell PowerEdge 1950",
   "type": "cluster",
-  "created_at": 1164927600,
   "uid": "paraquad"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-1.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-1.json
index e14067ee70e982e3433d586088fef61632bacbb6..85669f6614c669156d811b2b6f885ca0729d5ed4 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-1.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-1.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-1",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-10.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-10.json
index 885288f9e55808c6828e430f73992ad26c1bccb0..ba2833100ccd04a90f80869ae4459e0e0fc348f4 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-10.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-10.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-10",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-11.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-11.json
index c02571dd2e1ac8004d819681bd47e7f41865768b..15b0a749bdc4a820a7707aad33d5e08545d7dd98 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-11.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-11.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-11",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-12.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-12.json
index 1f9830af55fdb67ed641f8d8846d5967ccf7e89d..a1fcbe6d263b4333cbc29b27b4038f327dc0a585 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-12.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-12.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-12",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-13.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-13.json
index ad1fc3c6720f5dcd1d56cd0701e3ccde0e6f6663..b00b1bc9ad27e3ca19fcca7bec458dda65237e8a 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-13.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-13.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-13",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-14.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-14.json
index 6589dcc65cb729bc558ed1958357899d32b83456..6cb644831d347cb0a9a8447c285f545b6a93dd2c 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-14.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-14.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-14",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-15.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-15.json
index 4eaffd965093bad7df364759391c5ca75cff68c1..1510ab81871cb6de42bffa051e014cd60313b68b 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-15.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-15.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-15",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-16.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-16.json
index c2d2344ce2db547f436e7427acf0027be22c689b..6f79233f4e1c850b5b8f58cc028bbaed85de2059 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-16.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-16.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-16",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-17.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-17.json
index b3bf06e918d3c5b91321628af60e7ffc8894e3c6..6ea0b13e82950e763a0322de0d8873877eaa9ed3 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-17.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-17.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-17",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-18.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-18.json
index 00e27bbc09ecd7f713ded91b2a03cec6a1c8627c..5998494f0802667529f184bb855a87798c19e3a9 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-18.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-18.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-18",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-19.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-19.json
index 88a86bf4fef1f79f083244b820ebb0bfbafe2611..eab7aba73517059674377adf87b11a0354eda510 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-19.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-19.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-19",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-2.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-2.json
index 38201e631b38ed9c3a6a8fa092d3380d0f089bab..a3dca5d76e3602e590904d0c33a42119edf0fc1c 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-2.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-2.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-2",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-20.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-20.json
index 02fe356540a926f8ad911483204e24b791d5649f..bfa8cc3d26075d9df3b24eb48186ed1975b7d84b 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-20.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-20.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-20",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-21.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-21.json
index 9e28d802bb6a2cfab71cbf352ec8fa087a5d63f5..ea2a5ba18afe8b7d10a2c589d30f6b6384690bd5 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-21.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-21.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-21",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-22.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-22.json
index 0330790ecec67d647d2a6f637f95fa40ac421ad6..b183bd87b011d0fc6c77d2d6a2578ca508b41ea8 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-22.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-22.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-22",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-23.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-23.json
index 081d3a36c9765558766ec6794729a045d44e4cf0..73dca93ba748bada3a85253f5e172d04148bdc65 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-23.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-23.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-23",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-24.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-24.json
index 7fa87de20d857032dcd9e854fa7702946fa7318d..8f43a4df7ad67557cebaade642d472e062050b2f 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-24.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-24.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-24",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-25.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-25.json
index c8870d7f2727ea6f0b2c919b069ead77efa85c3e..d9e983fb42a2b3bab6c56b930916dcfd1d405d86 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-25.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-25.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-25",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-26.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-26.json
index 24314e930c7f7480379d4c75338866bce17a978d..c842b29de940b049cc63e81181ae7ec15255a966 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-26.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-26.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-26",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-27.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-27.json
index 2a94b62b8535d7ea7a998015ae2dfadd8e61ee00..066e908b1f0c1afb7aacd901752f3124d354cb35 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-27.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-27.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-27",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-28.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-28.json
index c315efecdf025f0643a5b64413dc0b730e0e8f48..7adc004e62f97adc33f92d792a75999f9d3cab26 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-28.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-28.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-28",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-29.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-29.json
index 810eb9652c693db503b57523c3a38710c919953b..bb8d70e5286b9ae2cb86d518068c8db25a540f60 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-29.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-29.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-29",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-3.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-3.json
index 9b07c1d4713f19fda598e757995b48e6ba92bcec..69490001c502fba90faf88510533f0b76dfa3ef8 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-3.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-3.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-3",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-30.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-30.json
index dfe38666b14a9f324a84cd6a468a8fa7c0c81d3e..068956cd236f961e9bf8c6ac0a038d6441da79aa 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-30.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-30.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-30",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-31.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-31.json
index 40c1cd7830c96b0468af89a123dc7d0a7f92c82e..23cd79160da07df2bd7ecc9eef2a870574ee585a 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-31.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-31.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-31",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-32.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-32.json
index 6e6f7e26ef6fb46d6576f4125033c7ab98cc0d25..ba031bbe0f4ad69f5a4d1559484f69491dd52d5f 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-32.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-32.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-32",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-33.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-33.json
index 4cb2e1007b55df305dba1e0d86fd0941b6c032c9..5956da98c5b7b3935de1d51af96c14db5237ddff 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-33.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-33.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-33",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-34.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-34.json
index 80e6b25c4471ec69295e9fa153aa901ade9d1045..321bbc8563ffc3e71027e7d89bf84cc6f3168e22 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-34.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-34.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-34",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-35.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-35.json
index dc356a4141fc692f9e27704e0ebaa1f95141567b..773a46f680f275f018e823ee2995f122241d4344 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-35.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-35.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-35",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-36.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-36.json
index d2f530adaddb267f0aca5e494dd69509d64a4f30..1211df03c484a48d6a46e1938e3c7e6111490fa7 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-36.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-36.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-36",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-37.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-37.json
index a30472645cdba09fbe29c5f94b37b04100832cc0..6788ff053941dca59b20c496509f3b3efce22821 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-37.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-37.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-37",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-38.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-38.json
index 043d2f0ed8bb83534bf56e75cce0a78195843059..2c9792b615fbf4122110d2b68d3825caea3d1b2e 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-38.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-38.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-38",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-39.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-39.json
index 20889b0d9bf62d8d4015579105a5dd4ff47e5c4f..dac7fb25301ef3d3a526f45115c4b51637f6da7a 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-39.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-39.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-39",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-4.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-4.json
index 59a34315ddf41b19ac9c1f0bc69585c214fe6a96..973f8b096acea02f3b0d700fa35efaba884e33e1 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-4.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-4.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-4",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-40.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-40.json
index 8db848f2fbc5290317b7bdf5dc810a36c19a22b0..995e6e88748dd8358706cc4757e54eb59b39be18 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-40.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-40.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-40",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-41.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-41.json
index 495db7c2ffe1b75a069fac8d171ce1867d312b25..575fa095504844e4579a01e74d425d3369f43c93 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-41.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-41.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-41",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-42.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-42.json
index 5273258c9cc89a3c4af9c4aa6d015728eb22994a..dba1dc2db2bccfecaef0cc87e17e8540ca4925d6 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-42.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-42.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-42",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-43.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-43.json
index 5c6363d7f7662ae7ac87c2de2638806aa0f437f3..2c5c478f4eb27091aad3dd54dfef8a7c30500b86 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-43.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-43.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-43",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-44.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-44.json
index 4967459cc811bf37ffa4eb30cbae2be5ab42eb0f..4a9ed416da34f23e2fc94418085dad1c455decec 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-44.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-44.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-44",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-45.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-45.json
index bdebdb473c70249d94b3f1533a2384b29c6edfa9..8dccc8da7f601defc618fbb166e408652e06284d 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-45.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-45.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-45",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-46.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-46.json
index 339254a1772123e4b1def6c90545a60be7c84823..c2ca3ed058eb32c4b86b78f40305d8f27a738732 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-46.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-46.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-46",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-47.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-47.json
index 17d2bf21c567b85402a7b657899682041696d628..e5a9e8a38724d0c07505e1f2063cbce7bdbb0ca3 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-47.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-47.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-47",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-48.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-48.json
index 9534f0d9cf017dffa3ffdd64073c35296f3444c3..ce9fe904d6472a2d1a542f51d5193a20da2565e3 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-48.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-48.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-48",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-49.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-49.json
index cfe10dd8ffe8f6243cf2182a3b02c200676fd2bd..f57a2643baeee2f40910a9ebdd4e84a926799d34 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-49.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-49.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-49",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-5.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-5.json
index bb160a8ab8df1e0cb2349c6388e9985d966f2757..6ab1395b6d6b907af4925d5bf0d6907c77c2de6e 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-5.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-5.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-5",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-50.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-50.json
index df95fae89d22d256bc725b69a4e54960f3b31da3..63a63d0ac3f54c8066a2e95205f14261549a214e 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-50.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-50.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-50",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-51.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-51.json
index 2aac3fe86435892c87f433c4bbb2fe4a1b3a9f38..73f28487bb82caeb109ba46ff4adad32f96b2693 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-51.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-51.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-51",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-52.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-52.json
index 686a8d8e72b1696ac9a62ddb5a18154552f9f976..74486913338c4be6403db3311572448d22b337d0 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-52.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-52.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-52",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-53.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-53.json
index 7f5bb282fbc54990ca1f472b2664f4bf6ff83b16..6b7f03f5c577bd70122f0e73635a87a6d33ce98a 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-53.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-53.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-53",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-54.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-54.json
index 74842ab57bf58e5ca3a475660d14915e16cbeac6..2c54499841cdb4934732bf58d102e0b740dae322 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-54.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-54.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-54",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-55.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-55.json
index 8e431c75d30a4cac730ab4fc8a9ae84add4940cd..2893e14735e9806d385cf9e32445e5bc8a096631 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-55.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-55.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-55",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-56.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-56.json
index 356ed26aa218b21b48184cc593b63f863d1abfb1..923a4e23a66b888419a14a8eba547db0ab342420 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-56.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-56.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-56",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-57.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-57.json
index a7c4d4e81e714be5dad8a3fbd36b407a5dd35ca0..36b5f345415644a0ce58e78584830bdd30a5eb07 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-57.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-57.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-57",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-58.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-58.json
index 672cb81658f5e3dd15acaa2d473e5613e8759db1..39593ddaa60e1a28ed15032e1fc20055dcff8402 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-58.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-58.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-58",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-59.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-59.json
index 5a23beda4c657b3bffbeaa4d7f7e74f806b14a9d..84fec8a70fa93d48dd8e16926d432ae9a73e12ce 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-59.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-59.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-59",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-6.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-6.json
index 168e29ddf07c8790490105d4cedb48a22ed302b3..a9447a5299e47418eba23a95c88c5b8a7d0d7710 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-6.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-6.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-6",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-60.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-60.json
index 1136e0884f8e71eac0c97336104af2d05228bf7b..7bb1aee3ae24b0c342c185259ee92eef0dad0487 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-60.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-60.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-60",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-61.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-61.json
index b4048a9509c7f78917f3850bfa2c5370a0d23ccc..f8abb12d1f2db58ae428354462606c1a29ef8b50 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-61.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-61.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-61",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-62.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-62.json
index 1803e8db433c84dcb0b8194d3572c4f0ccdf41fb..ef8077b353e98cc25078651826ad12a5fb261933 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-62.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-62.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-62",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-63.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-63.json
index 272cc19c596a40f4d35d1df3ca9e0c87379921b9..01d43306ad1100638a00a14c0a81a0269de83ddc 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-63.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-63.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-63",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-64.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-64.json
index 85fc9b3aa8f91f8de0f43e3203e14b4688b1d235..d708e8365618a17c64427115b2f32a7dcdf44c62 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-64.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-64.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-64",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-65.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-65.json
index 4fe209929c5e272170ae9ffb92a99d6bb23655fc..fc51092f32d0ff2383f86b7a08e094e9996388f7 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-65.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-65.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-65",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-66.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-66.json
index 5c0ec55fbc8a3dc0cbd6d653db8435ac84664784..4ad2d677b0e6305be6ced43ca2e76061c391a403 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-66.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-66.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-66",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-67.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-67.json
index f9126367d8d1adf1c86b59726b5cf080aaf241b2..bd8d75280cd5399a44284dc21062f2636e772528 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-67.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-67.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-67",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-68.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-68.json
index ead1c7289708b5c1999a52547951bdbcc2d27f11..66f64e66b3210c2d2063e4517295d82545d2c41c 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-68.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-68.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-68",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-69.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-69.json
index 843dd6f49baf7416208b5c284b556cfee4a04130..0e9c9abccf6ebf2f4ad43d5f7779ee5c7c7a8a6c 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-69.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-69.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-69",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-7.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-7.json
index 88d130754ea5ba37c22b5f1b415557447b6a9121..96920a15ccb9fd0f258d2972045e206027ca4242 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-7.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-7.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-7",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-70.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-70.json
index 6407c77f80158b9d78788edd92f8113b87d24f1f..7f1f1f2bc9c5464fbfe564ebb003de311c736dc4 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-70.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-70.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-70",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-71.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-71.json
index db3cef4c15a968a1b0282b6d11893551945c47a8..7826ad28d2d2524e95066ec0041ae712b8cf28a8 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-71.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-71.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-71",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-72.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-72.json
index 49a25477e12ef00feb53035421596d424a7d8689..ac59ed47d45b00cae292120fefe3f22892cec35c 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-72.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-72.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-72",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-73.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-73.json
index 0f189df0277fae23d5d039ce20355e6908e6e89b..a6bf0203b17f13f2089e5ffa4dd452f486b4ba00 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-73.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-73.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-73",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-74.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-74.json
index 735484861cb38c7fad3d840a3448b56d0117df12..f2f3d18fcbe44660b1c20c94c7e96299649c867c 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-74.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-74.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-74",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-75.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-75.json
index 4a39da746316defe53915d9c3abfef577a7f1956..8909508cd92ad85af0b186d6a1e086fd69a09c3e 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-75.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-75.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-75",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-76.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-76.json
index c9e6f1c3223f1c4e6ae781c55517d464fe94f3f5..023056c5a7aed39e5fc2e00cd8f28efddf1ed8bd 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-76.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-76.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-76",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-77.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-77.json
index 5d122430a7f77248e6bb28af2e7b67eebb215206..bd62639deb50674c8132008358cd247181538aba 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-77.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-77.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-77",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-78.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-78.json
index 98593e639fadda4d7703e9585ca73994a47591e5..0e2bca5acdab738f2ff8514fa19d16e42d6fd900 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-78.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-78.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-78",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-79.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-79.json
index 28f304e81349293d8a0f4f9541a532c33f2f1a54..174aac815b7b0aeb9ed865afb684dd2a41d8b60c 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-79.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-79.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-79",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-8.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-8.json
index af068ae1452aa49a1acea2a7cc058196f03997ba..fdb08873d16240f58bf72cd81e1051029e15e360 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-8.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-8.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-8",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-80.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-80.json
index 075bb7dd9ce730ff05c77f8d6ac2de8beb086b1a..ab6158ae2f7726f187503ece472c920f4e7f8d86 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-80.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-80.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-80",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-80"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-81.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-81.json
index d08af9ebf1df02d6cc5aee03f3e195bce20ea9db..05d4ebf9b7ec7fc92e0b77cec11539fb359beb2b 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-81.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-81.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-81",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-81"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-82.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-82.json
index b6b83ad51fa736103080cbdd2655f7724a7d9a81..d83173e464f4917e83627e10538d80bac6cc0f5f 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-82.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-82.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-82",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-82"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-83.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-83.json
index acb0cf1e2eae47190d947d1226879dacd867df98..1b8e93a06cf0583ee5742cc1cabcb3e18d74fbf6 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-83.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-83.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-83",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-83"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-84.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-84.json
index ed39b99a8fbf28496c7ad7ea5405c3381f117ecd..297e84316e0b736bb5684210567ca7addfba05ff 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-84.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-84.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-84",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-84"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-85.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-85.json
index ee39eee4e192b0523fc1344b8bd51330233195a0..4b759fbabf77bbd23d4851a93ee4a7643010e32e 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-85.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-85.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-85",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-85"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-86.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-86.json
index 8a433b77a0be831bfd69110b8a671213832496f5..e409bb03456f04c5cc2681dd012081fcd49192e7 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-86.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-86.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-86",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-86"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-87.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-87.json
index 4921b7385eded074746262342c3cb2f5527ee9da..ba44430cdb8b72229bb14e53521d48b9f32a9dd2 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-87.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-87.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-87",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-87"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-88.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-88.json
index ef69cfb42db1c42de27756245f2bddefc60ca98f..c774d5644594df043680b084b1acd3d6b1853a56 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-88.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-88.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-88",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-88"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-89.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-89.json
index e033a04381023c86715524d460bc43d6802809f5..b85124abddec4d9c32539eae121290988439be34 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-89.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-89.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-89",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-89"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-9.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-9.json
index 65399998adc16f044de7724450716d3e1e3b45aa..088f5d908ee457d93d9be7082966876840c3715c 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-9.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-9.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-9",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-90.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-90.json
index a29938ce470f42e0c817af4ffa28d8109ebadc85..7577a6565947ae05e4d4b49447330a1eafae48c4 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-90.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-90.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-90",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-90"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-91.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-91.json
index d34d3453d9b658020cfb8adefdf8596b7430a1a6..c5a840b81a406b6a51b445cd9d63ddeb1546aa49 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-91.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-91.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-91",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-91"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-92.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-92.json
index 226471995b70dcb9e1f97cbd1b33da9574753f91..2529d4ef1b3c2c364a82ed5da6a22b8858a8eab5 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-92.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-92.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-92",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-92"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-93.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-93.json
index c213846ff97ff5f15fa61192b80f12256f1aad0c..a1cd1ccbea55234c2a23f7d551ec419823982bb9 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-93.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-93.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-93",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-93"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-94.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-94.json
index cf9800b0618492cc9ca120f1b1a4d0284b521b7e..4a47922d4dedecca9577b4b73e9c01692c251ad8 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-94.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-94.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-94",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-94"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-95.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-95.json
index a11d5c7b5863256db4b38de29d29da74c79d92e6..d6a9b365f0bce56803fdd38cd70c3eff20120aa3 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-95.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-95.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-95",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-95"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-96.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-96.json
index 7d242c2181bfc1b146dd8b4790cdce0defab79ab..35f3102b04e692b74054b2b33f2ce0abd7431862 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-96.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-96.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-96",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-96"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-97.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-97.json
index b72848f968591f2116a53d8741459fb698ebaf71..f1ff8b38d108c7814f9ff463c6cce63243976404 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-97.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-97.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-97",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-97"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-98.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-98.json
index 81f24bdae05733d782c60745e6c8d8797dd3df4f..be346d53120077e0d7781d97fe29aefb2db20a78 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-98.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-98.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-98",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-98"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-99.json b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-99.json
index 36b548e44dc41f847e3f519c5ac471b274719065..8cb824eadd23f9f7872827f51a1de1f9883d5079 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-99.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/nodes/paravent-99.json
@@ -1,56 +1,56 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 74505805969.2383,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "paravent-99",
   "network_adapters": [
     {
-      "vendor": "InfiniHost",
-      "rate": 10000000000,
-      "version": "MT23108",
       "enabled": true,
-      "interface": "InfiniBand 10G"
+      "interface": "InfiniBand 10G",
+      "rate": 10000000000,
+      "vendor": "InfiniHost",
+      "version": "MT23108"
     },
     {
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2000000000,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 74505805969.2383
+    }
+  ],
+  "type": "node",
+  "uid": "paravent-99"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/paravent/paravent.json b/data/grid5000/sites/rennes/clusters/paravent/paravent.json
index bb3f082db1a36da4a8d16878cf0ce1204dde5e86..2a0ef46388c91fc990d5b54e2f83c16530d91331 100644
--- a/data/grid5000/sites/rennes/clusters/paravent/paravent.json
+++ b/data/grid5000/sites/rennes/clusters/paravent/paravent.json
@@ -1,6 +1,6 @@
 {
+  "created_at": null,
   "model": "HP ProLiant DL145G2",
   "type": "cluster",
-  "created_at": null,
   "uid": "paravent"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json b/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/rennes.json b/data/grid5000/sites/rennes/rennes.json
index 47b1d29cda736910df462b759048c1a2ba319c60..2286c639db677b9a3d08c13606b3b50d9dfc65ea 100644
--- a/data/grid5000/sites/rennes/rennes.json
+++ b/data/grid5000/sites/rennes/rennes.json
@@ -1,14 +1,14 @@
 {
+  "description": "",
   "email_contact": null,
-  "longitude": -1.679444,
-  "user_support_contact": null,
   "latitude": 48.114722,
-  "security_contact": null,
-  "web": "http:\/\/www.irisa.fr",
-  "description": "",
+  "location": "Rennes, France",
+  "longitude": -1.679444,
   "name": "Rennes",
+  "security_contact": null,
   "sys_admin_contact": null,
   "type": "site",
   "uid": "rennes",
-  "location": "Rennes, France"
+  "user_support_contact": null,
+  "web": "http:\/\/www.irisa.fr"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/azur.json b/data/grid5000/sites/sophia/clusters/azur/azur.json
index 778df4f4240f15efb299e604c9b68a45f9894988..99347e2fa99fe5f4525a38d788cee0349a0e3423 100644
--- a/data/grid5000/sites/sophia/clusters/azur/azur.json
+++ b/data/grid5000/sites/sophia/clusters/azur/azur.json
@@ -1,6 +1,6 @@
 {
+  "created_at": 1108681200,
   "model": "IBM eServer 325",
   "type": "cluster",
-  "created_at": 1108681200,
   "uid": "azur"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-1.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-1.json
index b07479e9942ede03d3cba5a6f08d0b6ff5dbc575..d7956c18a3183a5ca5fd3ca73929c407ff4d9de1 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-1.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-1.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-1",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-10.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-10.json
index aa3ecb58e72ac203af451acede707e367399cd62..1d142d77e985c71aaee2d7308b29b6fea10d8512 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-10.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-10.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-10",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-11.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-11.json
index b0ebaf422569497badf60bce8ec504e383c5b8be..bab481730c77015431fae65980d63de37ac03a77 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-11.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-11.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-11",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-12.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-12.json
index eb041a475d6ab7458ed8f586be6ba805c10db5d6..2c420e047c102b7a33f626bd70f3bc79409af2c5 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-12.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-12.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-12",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-13.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-13.json
index 612d1b900253537d2f535927f8d87d4afe187e3d..f34a29fddb5855f346c66ff4cb50a57657fa1184 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-13.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-13.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-13",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-14.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-14.json
index 6edc5035eed6caac666715d6ac9a17aa80a190ee..e8b04be38f44cded1150e59c6ccc228f2bff822f 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-14.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-14.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-14",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-15.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-15.json
index d978eebffbc05e0be3a88979806b3395b4ee753f..64e8f577ebdc8fa10a9aefddd9102926b8bb3e34 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-15.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-15.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-15",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-16.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-16.json
index b5b9ab15a0bdfb36d3cc9bdb008b70940c7c10c4..c74eb0aafbc872b775bc4f7645f848e82083d4e8 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-16.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-16.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-16",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-17.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-17.json
index c198c6ef1aa4efd0eb94ead5e1033f5b1a1694e4..23134487b382ed9572efd6699344b25b39c4e330 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-17.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-17.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-17",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-18.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-18.json
index 8a55c245f0a3bdeb148ce27b9154c1094b3a8d54..85e4a7b570f9d414af7431e00fedf412596ed1cc 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-18.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-18.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-18",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-19.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-19.json
index 2ac2ed4f083c9da23dcec7a3469ceca21c5a8636..81db11956ac8674fff4590dabe5728deb3ca66b4 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-19.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-19.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-19",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-2.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-2.json
index 46e6b3b37723914a830e696d971ad7008675b67c..561ab8d054d4c753f8cf8328c28423bc43406447 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-2.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-2.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-2",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-20.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-20.json
index 96a9cb01ebcb3514bffb41da31d581e382f0696c..be66219a26af0d651e4588677365897584841568 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-20.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-20.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-20",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-21.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-21.json
index 14db41105b5b60070e545dbf18eac31593ad9312..a520ada01a748f527bedfe75fae1f80ccbee9843 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-21.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-21.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-21",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-22.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-22.json
index f56a8b8598e3ec07d46b9e3d53e290a2cafe4bc1..5f78e11d31c7317611d521bc94a1fabfd96d5ea3 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-22.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-22.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-22",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-23.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-23.json
index 8477247f8f16e2d07b578af520f0217199abb0f1..82acc56d1f7c8d603bf48a59d7f8295737214544 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-23.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-23.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-23",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-24.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-24.json
index cb7618a7377264c0819dbacd6506cac649a67e32..c9fb2e1afd2051187560136eecf569aa1cfe97a5 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-24.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-24.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-24",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-25.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-25.json
index 70ea680237026a228cb8ccb29a979be93b689561..332ec8ae9187f752ff61fe36cb484fe53620db35 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-25.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-25.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-25",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-26.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-26.json
index d9d5326c8b605000ab0aeec5777df57853c8e0e4..8788ac921a769a69b7a11154a3ade048ce508e24 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-26.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-26.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-26",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-27.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-27.json
index 25019d62b5da4ac6c40c9dd259648ec55a1e8642..22425753dad68efdd737fb7f3e536f0be414c3ad 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-27.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-27.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-27",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-28.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-28.json
index 04d8f6f009451d12a7960cf00be82e239101c88f..a0d20c85d0e56fc06bcee82fda7eb6fc98956c36 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-28.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-28.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-28",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-29.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-29.json
index b4e3f135d0fa73f5ba0da438e5096a0507597f4b..bdba76929df1572079f76fa8f1f5ea957af02e72 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-29.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-29.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-29",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-3.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-3.json
index cb8b78f8aea7c2a986f3445881ad4f37c23dff0e..c283d7b10069c35e14808d5e149d89847ae6ed5c 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-3.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-3.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-3",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-30.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-30.json
index b3729f5680abd5be03ef1ec0a0793b1510922e08..e4b6bd39082947497c2339fb8931ff4957a5fe3a 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-30.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-30.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-30",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-31.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-31.json
index b0ed825e5ec30e7455991ff3ee70afa72da867ba..2891b07f883273e238e7fe02ee3a76af390c6924 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-31.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-31.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-31",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-32.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-32.json
index 58a25d99b28ab128a1313d41fd9c4bbb57bd801b..310dfed727a35f7df4b72705cc912fd89b5721c2 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-32.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-32.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-32",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-33.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-33.json
index e6295a718c778faaa0ee4b9747f6f1968b8e1e3b..e4c701c4f7f3908275260bb85e314dce45cdabca 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-33.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-33.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-33",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-34.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-34.json
index 4a44256207164db6db35793a313c87bde230f090..26fb248b122ff4a8555e4cb04836a1821f9ba360 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-34.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-34.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-34",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-35.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-35.json
index 3a38765c0205a05c47aaab076fefd8105b3321ff..707bca862f68f4104243ef69a046a7e84e89a69d 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-35.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-35.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-35",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-36.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-36.json
index 36e5b18c6d3aeb1b5725e647193afe212fb69b0e..14cab13a1b4dbca375bf88c33c418469b9cbf710 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-36.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-36.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-36",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-37.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-37.json
index 020e3b501274c2a4d57382f0715b414c684dd032..c11e600512fe38b779e4b3496037efcd665ef9e5 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-37.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-37.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-37",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-38.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-38.json
index 08fe86a161c20f7ef7a0c721616f8659accd42a5..d66604eefdf1b972c8a714110331c3c7779017e8 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-38.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-38.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-38",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-39.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-39.json
index 6745358ee590dc2b574585024003b0605a514021..46848028254d9e527469a94b6849037bb1b2ddba 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-39.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-39.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-39",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-4.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-4.json
index d4a18c9a027147a1aa35b1208b20b6037489f368..9b5f0e12158b253da47cb00fad0e6c26f25a532c 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-4.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-4.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-4",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-40.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-40.json
index 58ea2b9d0e776c5c2b44a6a1d62f5bbb50853330..77467067f9b4038e0d82faccbadadd5198e75b24 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-40.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-40.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-40",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-41.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-41.json
index d6ac93466ef1c8c498a9c6eb95bbc4732c474d90..a546707d7efb650794ebe6e13b041c2839a9bdf1 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-41.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-41.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-41",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-42.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-42.json
index d5a6511617871024bdef03d2c4a532432f0e67a5..d93e5574dddb807846ce28246ae71b1313fd99de 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-42.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-42.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-42",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-43.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-43.json
index e60769fc12ec1d340660c6ee806a976fc03f6a49..18b2d5b9c936c600686deec03bfa8ea05da507ad 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-43.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-43.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-43",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-44.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-44.json
index 4f0be2feb65eaa9b355b43a68748fa6f4480e1db..09d2a284c7ee3712ec6226c18c8960ac75bf83e8 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-44.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-44.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-44",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-45.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-45.json
index 8ac2168d8ad72ebb37c445add6ca3e44f7650c1b..bee24f40aab9b25dff49fe7d741bce584d7cff16 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-45.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-45.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-45",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-46.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-46.json
index c32a9697bde3d61ae13f64e75e37ebb951ebb967..0b9f0b98822ad805b99fc36fe4c78116eea0f0df 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-46.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-46.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-46",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-47.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-47.json
index 2fcdfb7517719a8e67a681e52e352f9d4966364a..bf7431ad0b594ba8674a4f8fe427841b8fec669b 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-47.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-47.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-47",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-48.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-48.json
index bd4152e9bab819ebde277b1021e4d4881b6bc052..6608431bb2f03eaca1ff4b7bb9656af0d944f59b 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-48.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-48.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-48",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-49.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-49.json
index ac09c608e3901c04a5e8c0803d4d4edd9843e6f2..fbcb0977c7e096a4776b35d55a7bb6be1ae426f1 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-49.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-49.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-49",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-5.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-5.json
index db96f966b43b4c0c2d89f65d1cd544c1767343b9..d09315ff0ce9b3c4dc204ddb44d0ac2acf73bf4a 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-5.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-5.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-5",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-50.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-50.json
index 738f8028ae09bf4577d0168c2c786a2980fd83f9..c961abc2f4097005f4e2178d384fe3f04788ea85 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-50.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-50.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-50",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-51.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-51.json
index 656a8588799cb065246ce8447e08ef893dc9d35e..780e1150c9d6bd90262fbe846230d62dbe7b036c 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-51.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-51.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-51",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-52.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-52.json
index 5cdf7686d4cd4b462aac217375eb6cf222322c95..447cd8fc3263eef6feb618c05324fdb940e074e3 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-52.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-52.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-52",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-53.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-53.json
index 0cc7fad9a6c5f1e9e0962e90805e4e09915bf1f4..4f64bc19afd80186428c50593fe1e11be79f89fd 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-53.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-53.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-53",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-54.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-54.json
index 8a9da20341888a75ba9b8dddd88d3739404d99dd..b32d07b9e47d9d7df052974367f68168eaf81ff6 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-54.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-54.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-54",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-55.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-55.json
index ee4f972c388888dd8bee88a0bf9c05386f4cb883..1ca5d0598a478aa26e71df1c33d1d0319ed58656 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-55.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-55.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-55",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-56.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-56.json
index 6acdc0a5d16cb3fb02819b0c561c25ce621d216c..95482951fa9e2c77f6808d8eb5c337c12420cac0 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-56.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-56.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-56",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-57.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-57.json
index dae09724ff6de41f0e4aa6fade54fda26b62685e..1e65480f2151b793a629bd40b7db2db503c79cce 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-57.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-57.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-57",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-58.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-58.json
index 7c54dca214b02fddfa1f3257b775debc81382c0e..24daeca62c77c0927565fe388625e5af2fbd4c2c 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-58.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-58.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-58",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-59.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-59.json
index 8b5e3af1c0fb829e9dde54589a7bc2dd5b1a47e1..395561bfcaab01ec71a3a597aa112f389ac06a61 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-59.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-59.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-59",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-6.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-6.json
index 4961d5c6c16b7875dd8836f19faa704db5f76ea1..31fec95c23a8e72bbc81947bb26477231fe3bf06 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-6.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-6.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-6",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-60.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-60.json
index 7f5854509a234a8d785a30a9ab422f3fb7cccbd2..902f1e62dc3a59bb9822339c46bdc57adecfeb78 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-60.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-60.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-60",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-61.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-61.json
index aa343b91658cf2f762f7501099403f9372c8aa92..8400ded908acfd673c9c5b111ca20320fac4066b 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-61.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-61.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-61",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-62.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-62.json
index 48f8b3804503a9314eabaeba60fedecd5ad71eb2..c8720e7efc87a61b7e357d18c69ae28ec753f05a 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-62.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-62.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-62",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-63.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-63.json
index 062f9aa170767b6835032656e1fe2c794ef54885..cd936d777467fa4054953bc50f0eb9e94a0bb906 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-63.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-63.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-63",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-64.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-64.json
index 727524a6783c7f01080bf812714d1de72652efd2..da0aabc84924fe9642dc165ab45ce2d36fd83604 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-64.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-64.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-64",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-65.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-65.json
index d5ba58e68d94b410a546aa2a6845e5083c97a738..a569a62f615ac21069d65350f32db327e0b03d1d 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-65.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-65.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-65",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-66.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-66.json
index a1f55ff5a30ff612e8e7582f09e7f31f2b373bfc..48b44c30c97f349d33a53699537941416845ff50 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-66.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-66.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-66",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-67.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-67.json
index a54ea485cafe6768a720c4a630b774a26481aba5..cc5f0a40cf327699540614124ec374d82e02b990 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-67.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-67.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-67",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-68.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-68.json
index f9520bfade8f904fbbec82ef2fd0faeacf1c854f..6d5042cd0f43e496c0127a4bf4bfb2da81a98936 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-68.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-68.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-68",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-69.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-69.json
index f2a5585cc4217eeef2294a144e9576edbb676887..848cb01d11871f9423882384284d72fac29f9650 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-69.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-69.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-69",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-7.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-7.json
index cfc606b9e3851a0685b38eb96be60f93d98eb7db..a76f7a1f9481a0e2bcae1505cdb097e6da5522bf 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-7.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-7.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-7",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-70.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-70.json
index 8201d8375ccfbd8002858797dbe46d00b3395f3d..858c89f6b8a2d540e0b7e5dd810e88e3f272ec61 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-70.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-70.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-70",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-71.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-71.json
index 3d22a99a492abcb5427fc3f78965ccbb6e54c31f..d1904fc8bc55dc8d6dba6947f68aec239498a4d3 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-71.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-71.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-71",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-72.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-72.json
index e527a923f7ed16dc8fdd927fcb324c8026b25d4c..2f1063ffe2821add100436e7211a91942495194d 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-72.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-72.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-72",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-8.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-8.json
index b30fa168f08145814fd1774f79c1621e4ccf05db..719a96e298b46791ec659669c02c18a92166da38 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-8.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-8.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-8",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-9.json b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-9.json
index 08831a423466db74a88d259539b541675fc08239..ff1c2c3b8a4d48733c762235c43d279c6227d59e 100644
--- a/data/grid5000/sites/sophia/clusters/azur/nodes/azur-9.json
+++ b/data/grid5000/sites/sophia/clusters/azur/nodes/azur-9.json
@@ -1,40 +1,40 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
+  },
+  "main_memory": {
+    "ram_size": 2147483648,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2000000000,
-    "version": "246",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2000000000,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "246"
   },
   "storage_devices": [
     {
       "driver": "amd74xx",
-      "size": 74505805969.2383,
-      "interface": "IDE"
+      "interface": "IDE",
+      "size": 74505805969.2383
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
-  },
   "type": "node",
-  "uid": "azur-9",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "azur-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/helios.json b/data/grid5000/sites/sophia/clusters/helios/helios.json
index b7111bfa6561362d01a9d15a401daa0d2f6d5a6b..eb03b2317307e4b41a96413399a99d797d432ee6 100644
--- a/data/grid5000/sites/sophia/clusters/helios/helios.json
+++ b/data/grid5000/sites/sophia/clusters/helios/helios.json
@@ -1,6 +1,6 @@
 {
+  "created_at": 1149199200,
   "model": "Sun Fire X4100",
   "type": "cluster",
-  "created_at": 1149199200,
   "uid": "helios"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
index d2c5915281b585ecd57935830800a93850236921..a698ba11a339677ccf2be54268d7e098489c2bcf 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-1",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
index 212cd22323f2ede39214f689a475b8fb0a3b9e52..afb7a37e0dd8668bd6447bd50b918ab3ce62ece9 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-10",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
index 54c555b7415e038cc1ff04ca175331361e95459b..e9bd5232ff62ac7467a129800695051bee64cbc8 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-11",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
index 5d7b01296c6cf449c036edb8f63698c8ca8dad9a..00d089fba59a88d07170fff67a7a91901312536e 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-12",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
index aec7c8268627add2950066b907b44c3251f526d5..f68368fded04f09235fe4b72ed7b9a48426f2d09 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-13",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
index 1811ca5da968f3cda897661973a3e0cecb7de68d..4f418b8a9e9f9b38b5a6e43f55193dc1b5c55e9b 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-14",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
index 6b9ddf87b9241488d5b2b00d44aa20f815da067b..1a514f079ac6e0d084b7d55d73171ac7ec132427 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-15",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
index 8abdbd28f41a13cd37117af453722fabb419d5f3..a9ed0ba16aa9240da3a6828bf3f3da131bd55b84 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-16",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
index 9175fc57246dd85a57818988e8f6052e710929ff..02be965e1145033928d52b75a7625dc70ff234e7 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-17",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
index 5aff950fc8e0afffef1b31e578a5702844e73c4a..74fed897eb805753968fa9fac553e0074775f4ea 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-18",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
index ee4c400c02f0779d1750b27fc5441fd171709bb8..7b796591fa7bb962f3edbb83fc6967b5496b0f48 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-19",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
index b674d3520d06ba73567454153f62ed3c60ef9d49..1f339384e32d536776cf795b304bb2a49d85ec10 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-2",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
index d86617f757b34aa5d401e262923a8ac045521747..0b80e74071de8daa2bb720a4016ee03c3485e961 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-20",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
index 9bcb4ae8a6baa77748b44e81cf5a96091d371c14..ef63f3c03372e7f382a6a9183f3288d01c377310 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-21",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
index c7d87a8fdd0415395db954b07cc7798fae9e92a0..51ad307cb4136267927d2c5ec6b61c26bdc06093 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-22",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
index aa1e3732b08601f2a136e5ba05572db056304997..536c6d10390347c9b9a50c9036907171a7794bc1 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-23",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
index e1aa0206a7e65ffadbcc6f555b544122643ef3e3..a5720ea5c7fb894a6df5a5e5b0dee54375cdd0e0 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-24",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
index 33d5afdcc25c52fd5cb023a1e0a340fe61532a3a..8b003f1bd5368727944cd6e9cc3146c9ed42e617 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-25",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
index 8234e7e11537bcca0fdc4290ae8f4ac5564836c0..f5fbfa598149514d491d579b954d48907ec57454 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-26",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
index 1783a4bf49815a7a85c1040cc9bc9811565fe1a6..5c8d3aee9253868a01da86908d9141f4021a4e74 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-27",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
index f1fd9e5b659ee19eb2a0e55efe50e2956d2e3b84..6e0466ff061e7bf49843c875dc3fb16cdfae4a6a 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-28",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
index 8534323bd82ee472c7072b570c7ddb50e190c865..af0b40f1e9ca4e7d191ec01d22d8b7e9bfc76a77 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-29",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
index 6490ec377bcd7380b295ded8177cdf6ae2f86ef0..10cba8ed322c575ad37f99e04860971ee92206d5 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-3",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
index 6db7ce10dc337ab1911d82cd8c5ee3e26d416ea4..2fcfff4b1b3956c11241d613743cdbce0c5ecd68 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-30",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
index 3c2b5db1ab4a940b603447d16e7f797824c27a5e..d9c611eef8669e91816e3bbfb23d4367cd5be7d4 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-31",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
index 48e08672aecbd32fc86cf442ea65a045e5cba062..a920c377c3f3547fe13958a699108c2c5fb27ca1 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-32",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
index 30ad21e0df5f2eb1153ea29dd2aee18957ddb189..3ac68ff5b9d8781200473fb3892c3175dd13dedf 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-33",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
index 8e47c5b946c13c324249d644f17a5481e3119d4c..045321ec5a62f69552fc7fbd0c9833b308543ebe 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-34",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
index 0e8f7e7819c1f6df05ed6736bb101e835e96af80..e510e116baa123851a7fec1875d0813802488835 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-35",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
index b3fd6a01dda812f204a450c1a960980ff0b0b18b..cb79bcdccfc516a90ef98304a46bde5da09ef194 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-36",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
index fbb28a673520c481d39e968e662fde55b9376340..43e06a8bce763233045bec7001d5a7dc94b588d7 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-37",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
index cad257af6f42b7c7784164458de31da32c1f9598..231cf3dbf4d69aca0f87bd68af6728db2e106b86 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-38",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
index c24a840bbdf596bad80c9cd87cbba7fba8f21323..19d299ed1869ecf46b4a376f9ea18988763e0c9f 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-39",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
index 0a4b1d9c600eb12ad46aed3e3b39d56be0719907..926410de3f2d8290bd002b6b91d2c1c8eabdbc98 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-4",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
index 28ec754b27e5122d60fff6c432cded7c4192c86a..17821fbab7721edcb9fd3a26f59bec614e8c2dca 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-40",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
index 4342497ff818cc21fe8195d5213589ba639b00a6..a31b7b0967bd3f791d128a1031b823055059d9c1 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-41",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
index e7b2d58e6aa1bb82343d8e831f5ba19e0220bfa3..a759ffcc8628850de09a9031bed1ca90f37d55e0 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-42",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
index 7166302fce3b0afe4caf936bb10ae337d368bccc..359c48e664cfb9214f4341e09ed4f3201bfc5a1e 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-43",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
index f17a4cef08b67b7b41d9ee9cc39e39aa7e42c404..fafb9de43dd8a4465fa07bf8fed555c2159b827c 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-44",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
index 27bbb1f25442051ac1e71bc676658b20181e110d..8a7f9f83c589c69f6d3362969a495853a6bec4aa 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-45",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
index d269a34f01034d0c5bee9cb9e70187cd542c4cdf..3aafdbee8c70097e7c063d96b528b48da5fc2c40 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-46",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
index cfe648539735c72e34d0cd856db42410504f61e7..f0f3aa2f178d685c11189ab604af86fe7db2f68c 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-47",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
index 734c65869da27e0b5983e655719269c49c97f2c1..7bc63168c71efb5fed73e78f852e6f13d1183eae 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-48",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
index ed7ff2f3d126988a77de263648d7f59cb351104c..9aeafe24585fb20cf8ab29e84ff82197d45a651c 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-49",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
index 4832fd8892637a4a37457f411df20a84e246f5af..3e26ef66d36af79e0daf3c9f31b84ed0be10466b 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-5",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
index 7f469c593b926d5f426828500272a1d086a96843..296ebbc902ed676cbc16c7dbb428cd3ca6a80f1d 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-50",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
index e75b3047dccdac6ecad5f75f04b485f1356927c4..47ab324782415446174eace33be8a7359dee64e1 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-51",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
index a7beb99b95d64e140814f7e4695ad09483f61d60..37b25248c2cd11e2b7a97580d01fa884c5c02a08 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-52",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
index 902b01069d7b7ed0c750b60bbcc5cd215b710e10..15983dd9dbfa4e7034a844e0595a01e794bd3aea 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-53",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
index 4eba42248e71da433f1506dcb594a2f7e703e5ef..f0034cfedc6d629913101e577c3adadc4c213720 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-54",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
index 4e44274a8b8f20676c07ff2d895ede9c20b1a2fe..30bf2fd320fea8bd4e0aaafc33663a5a4d64ed39 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-55",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
index 92bb2dc791980d05079164cc2b91d8cf8587568f..e5246e8ec4997ddc2426da1df82c4db3e1ca6fd9 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-56",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
index b6a1d68b4043339d947f7366a3981c55af9d14eb..852fd387759141cb7efc04b184b770cf245e40da 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-6",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
index 017f2cc1565fa64f9b7dc0145824f78163c716a0..7f9a39c59fff6d76986088f4b00af5812da9c8cc 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-7",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
index 522ce6fda5919b4c8d6c266d9172c988b2ed7408..e57919feb42d86dc2c425e78f3f0397f3e0b32de 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-8",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
index 704bf42287251f1f2e393dd416a5ff833d6b11cc..d76ba324af550834cea0a97c2441c7173ce852dc 100644
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
@@ -1,47 +1,47 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
+  },
+  "main_memory": {
+    "ram_size": 4294967296,
+    "virtual_size": null
+  },
+  "network_adapters": [
+
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
   },
   "processor": {
     "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
     "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "275",
+    "cache_l1i": null,
     "cache_l2": null,
+    "clock_speed": 2200000000.0,
     "instruction_set": "",
-    "other_description": ""
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "275"
   },
   "storage_devices": [
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     },
     {
       "driver": "mptsas",
+      "interface": "SAS",
       "raid": "0",
-      "size": 67986547946.9299,
-      "interface": "SAS"
+      "size": 67986547946.9299
     }
   ],
-  "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
-  },
   "type": "node",
-  "uid": "helios-9",
-  "network_adapters": [
-
-  ],
-  "operating_system": {
-    "version": null,
-    "release": null,
-    "name": null
-  }
+  "uid": "helios-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
index e60aa37aeebb82f70935153c91c614197b8dde0a..5b86783b8a822f915cf98d6a0db6823d1072f2e2 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-1",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
index abc3c6ce913951a6efdbdd30cdace185889778e1..676a1ea9f55a55fd7ac0a49ba0ae7d8bbbdef095 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-10",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
index 8f1c791cc723178bcb45fd3ba168307a1e2da538..23623fe599be9307dbac426951cc2547bdd5ccdd 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-11",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
index 8be1bf51c6afc82c1a7e2fafeac582868bfbd31c..0554c8419236f12a6b53205c9b66d906c41c3cb4 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-12",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
index efb158d2e47cf1760aad76fb964f632af28622b9..9ed86260292cf3eec5f9ca46bc30ce2e35ab6e36 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-13",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
index c6a7a1e7d457a2e33800e319d786418232e17f2b..2c03530eeda50291118da1f587898aabc4b9c2e4 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-14",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
index 3ac1fb9492db51c5d1dde2301ff224768ef80b4d..fbad42adacdec3cea625b23c34b2703a41d0f149 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-15",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
index d124ead5c637c9adc27be12c8f95b6c635e16305..d7ff52dcb5bc0e9962bc4fa5d8710d8ebfbb65c3 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-16",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
index b22b458d33fd980366939ef27b981052fb50c9f2..f4601af73936bd123fc03f98efb3277270b40594 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-17",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
index 9e521d0edbeba19c3cb42731a0186a215fa04527..2bf5cfce58dd2d6dc1aaf3d41a17791920e19063 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-18",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
index 5513d2971ccff482f76e475b92e46425c75b65d8..3da80746d9af2b259441900137d1e75f1dd98e5c 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-19",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
index 0f0f3634e9610cc6026912b227b7c057cb338291..9e78ba4601ef37f3ec8ddc9efc1bac7984704f8c 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-2",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
index 24b7247c76568b506a45f75622f6d957816dda7b..b5000817adfbda172bd367cf102e7d183a306e58 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-20",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
index d9bf48dd817f976b165ebf865b9805810af5694b..4bb57fdc455c42a13cedde28914d3f0edb328a0b 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-21",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
index ab58a3f91c885b46fc7b2072a8873edffc562a28..de5461972fb1316ab433ec67b438b75c218d0a3a 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-22",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
index 6513799b94cbb3c3fdd72ce6311880076bb4b75a..119478d1c7e094a8cb8edb969a0cbdf56067a7b9 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-23",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
index 1c1f6b50d69e2e6b1c036f494a98d02d11cba8ca..23684c4e3beb9bd622d213e21c0679eed906c907 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-24",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
index 0e04e254d56d8c3a55474a55a1ef2607ca5e7770..686e22af7facb6d10486082d9565db7b69ac3c03 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-25",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
index eadf26b02804187933f599a3938d36e2e86f6abc..cc70559d5440d1d3f5c420ff7011c0e7d84328f9 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-26",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
index 389055d9cb48e84306bf03c7f0a9171e2608637e..1ded68b6ae8e1ad366e2fba2a56da597c4eadcbf 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-27",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
index e1beb2556dc2a699c4ac61b0fdfa51c82bbcdd8f..57b6ea76d86651c34b2f101e9149445ee2755da1 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-28",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
index 61d4a2c1ea6752cb064733665f8f358b1e4526f9..d0124cdc294b466713269de4228af2d39253623e 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-29",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
index b058d7a2e82f08ebd2301ef54ded04f1e1f129b1..4bce661c69d5f4b113b408ea80729a4027f1a9f2 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-3",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
index 9e38a955a9c8956fa1362f366260eb0b8bd6049f..c969ab8457d36ef5d6ad229efa4d44d4d92365f4 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-30",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
index 553a334b0ab12a858f56bd71ff47678ec2511eef..d01c527fc3ab4f1ae97b4bf360af374d4187497b 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-31",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
index 2ec7d8fd9103280a5067d80b9627769b0c358fce..b4bfdc08507630393d8ea6944ee5a67ae355b37d 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-32",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
index 3eca5ec9db01f6cb27a663575796827730215cd5..3d9f72e656a67ec71a3015ae57838b3a4c9d9fd0 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-33",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
index 0ed143b9d059ac54a17686eca11cf94975e572a5..b57eac2f6db5ebd4a6e0c91de8a342fbef544745 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-34",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
index 93e6dbd6bf4c5a34f2773791f1b8dd1c999df6e2..be13f1cff5b3c8ad114f4d4fa01411b59afc4184 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-35",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
index f8d36098e53ff3609556f13d1ef3d70289f75d92..c668b2e728cf8d9c5de7ef5b584f58ccd1e3e14e 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-36",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
index a911dccca0587cd3a26eaa058cdeb71eb329505d..751a907b16e1cfec677f7cec11f32f822d743279 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-37",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
index 0de20fa4d6f55eb9db9413bd7442e400646779d9..29cbcfce58b609e0bd5f4c95e6c6030e85694ab9 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-38",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
index 6dd5ebec3a9107915d1d760bc1f9dddc22abd9e8..ca7a3324194268c4826dfbc5985ef8ed3fdd9430 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-39",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
index a0f5d00fdb9a1d9fb88998335ca3962157f93f08..da35b5eb856bc863528f77a0a5463be3d6b9025c 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-4",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
index c9d4f8c9db1aafb813ad1a1412ef02534717ed83..9233043ba4c4e9939de4ab207ebc8093812027da 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-40",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
index d356ff6d3aab093f3c2374d789803edb6cbb1160..e447d04fd3cba20758fbdd55bece24ac5ec517f6 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-41",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
index e421b048d9e4094f0a1545266c872e5bca04a907..dccfb6e813f54b27eb8393f08d4ad7bb10aa896b 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-42",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
index 69bc649db22f8e912e5e8c2bc6a992b39c63911f..67cdd77be44f19ce0c52ad6df46558ef013d96c4 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-43",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
index b120497147c25003f88a5b05a5f16cec7c10dfcc..ab73286dd87fab9d870e806ea05905715467197e 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-44",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
index c34171d4528c353e546646a9dd09e851adf95279..93b225d166de5a56c2901e473144fc63e7bc977d 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-45",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
index bddeea53e68bceaab8cc7327020e975fd41c4171..e6cf329fa8be8a1ae8c8824d7ae3ed57d4bde262 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-46",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
index 5dda16e6bfc5ac37d44647ff6ac166a4426b9c2f..80a195dd975d7c6a4918d7cff79f44c2fba3210a 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-47",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
index fb5469e92971db851b2f11de4650ae52b3913133..0402f268f12d20c3a2ba02c7a1a856044a7ada64 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-48",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
index 529874baba0bcd67c4b4d3438a731f7c8433f8c5..f40801678994763ea5f72970a77aa0ebc5cc28d3 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-49",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
index 1010e529d9c1c6c266abb93644b6f0e56d1e6805..1e1a509a3bde6da2e496783e6cabf0d654ebc236 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-5",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
index 0f58474947fba463c05b3ef36ea117374ddc05dc..8152bc60b1260ba0e6498f231da963e8ff188aff 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-50",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
index 5f1a6b3f8a160cbb2e2b403a0d3768c0ab05ec63..58681f8d12144bc44eb7bdfbf9a14e34fd7534bb 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-6",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
index 4f2da2b63093564b7f29a57ea8e1ceb7685ef654..546e1364a212abea623248930720a0c4518864a3 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-7",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
index 40c87aba0150340d3c2085db114a700143e22f82..e44884bb5b72baeb2ae1657e6f00d4cda1331a38 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-8",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
index ca11b10bf7822a2da2a575d87b47a910c89f99b2..e5ffefeb4adccaaa1ac7d42a532ffa656ff361e9 100644
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
@@ -1,67 +1,67 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 4294967296
+    "ram_size": 4294967296,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "sol-9",
   "network_adapters": [
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": true,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "enabled": false,
-      "vendor": "Broadcom",
-      "version": "BCM5715c",
       "interface": "Ethernet",
-      "rate": 1000000000
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "sol-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/sol/sol.json b/data/grid5000/sites/sophia/clusters/sol/sol.json
index a991a837fcab6f878e56e98a643e161296887a1c..e55934c535b17cbe4f375c6de1cba230a0450f14 100644
--- a/data/grid5000/sites/sophia/clusters/sol/sol.json
+++ b/data/grid5000/sites/sophia/clusters/sol/sol.json
@@ -1,6 +1,6 @@
 {
+  "created_at": 1172185200,
   "model": "Sun Fire X2200 M2",
   "type": "cluster",
-  "created_at": 1172185200,
   "uid": "sol"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json b/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/sophia.json b/data/grid5000/sites/sophia/sophia.json
index 020db35f81a5238ef6ca313020c9947b2463ae4d..51d6b7e58cc539d3d12111e8e9ae78d6b474f9fb 100644
--- a/data/grid5000/sites/sophia/sophia.json
+++ b/data/grid5000/sites/sophia/sophia.json
@@ -1,14 +1,14 @@
 {
+  "description": "",
   "email_contact": null,
-  "longitude": null,
-  "user_support_contact": null,
   "latitude": null,
-  "security_contact": null,
-  "web": null,
-  "description": "",
+  "location": "Sophia-Antipolis, France",
+  "longitude": null,
   "name": "Sophia-Antipolis",
+  "security_contact": null,
   "sys_admin_contact": null,
   "type": "site",
   "uid": "sophia",
-  "location": "Sophia-Antipolis, France"
+  "user_support_contact": null,
+  "web": null
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
index dcfdee12e08c12374f8a36ce2037a31a5aaef617..7e6b520de15eae9b79848090f6c0b71b355b61d1 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-1",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
index c91a54dd09852024320f17d8af6867db2bff0666..ee67dd599f67cb26f6486895fcdbd82847a3577f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-10",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
index 47a05476efcbb66c3f9ddc0cb0baacf9f49bd333..2e7bb29aa22b2e078a34413132cf02958992cd05 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-11",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
index 193294b096a491a63918b4aeb0fff00ad4063d3b..e79c14ac2996a0559744162be338d2b0fb630cbe 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-12",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
index 3a64126f13a430de94ccf43da3777fe423f3ff50..f589ae1bbe3d0c3d09de9861be2e1d9ceaa8a605 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-13",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
index 29c9d8ee09ffe07c520afda1fad58bdd496fa8e4..802a34081f6656e88dd30e09b55e5a709eff3367 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-14",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
index 31ba87612db37068d993063d19e14e825093525d..6567c00a61a0b1d7707d7454989034bff62c7630 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-15",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
index 78af6ff78a96590996c692d60d3234ac2f0bd8d7..6188a5fa551fe651769f8d859bc43cc13d499168 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-16",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
index 75d9ee0705cd2094a521072a99912e5a0a65ca1e..022b07f6a122dce8c47ab719d8c1ec0939b31c5e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-17",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
index ceb6053f7a5d5391e88a2744a9ff544a7e2f75cf..1efe0646a48a03bdf8daa42cb2784abea2cbc530 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-18",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
index f9fd69f18c92c5175c16a0b2c179973fb5303b51..91bcc54374884aa3e7d5c5d7a68d8ea710a04913 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-19",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
index 1515959052b144e72306b5e91e4b89b4b04cfefd..32fe04aacef6c4b44c4f6875d54c0aaeab6c7606 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-2",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
index 3a26b77f9a151fba7d5ed063dd65d3423ea982ab..52f98a21c11d2f184316338d7d5ad8d87dfa7f09 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-20",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
index de5580b4bb5dda1a7815dc7c58a691df56e923da..709c7d75ef0eaa57a5ba94855ddc981616f32bc2 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-21",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
index 8345c03b81d3f7df7ae633001aaab9fbab142f42..fb5192effe4bf6848124c3134ee795ff9079312c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-22",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
index b0ace59a36eb36501bd1b3c8a55bd569d983f9b7..894b04e7262bee6c00bcfa2eced1beca852003e8 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-23",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
index 55f8a4fd8f4e951ff0c61299f14be3e2e292b569..afb753f15dad16f7d52de05bfb0c22829fbefa92 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-24",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
index f4bafb0037d1146ae859dee38cd1ee81fbf19032..70755fdcfc241bfb44713ff16e61d62aee056c54 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-25",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
index 5659e91691f1c1aa4dc699dd567e0ee6eecbc83e..283b48dab71950ad5bc0eaa04672cf813ee13324 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-26",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
index 3fd3c9c535b1c395b42b5fe20e702eee03ddd0a9..5a4167f30a742df24b6635ae860cc18e13d6dc6e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-27",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
index 8b32553173165dabdf76f43c9c90dd1a1eb80fd8..e79d663435eb043b98d59de30cddb95f63605d9e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-28",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
index ba1e6be371eb2692a7c568389135742ee22816d5..1f42f2ec88ecb1a9d9c56612467cf67c67a2db04 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-29",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
index 2bbdca7fcb801f181ae1c6b0d807d1a307fbe288..c15bed41144cbc786e12dcbd4786b959eab2458d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-3",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
index 4fe34790cce65197d1d0a7d6d10c7a8ff42e0f23..853bf3bf869351bb51e403b4efd2dcf7f5a280f6 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-30",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
index fc3dadc390da1fce3f95cca4e134e3c69163e17a..317ee1d74b50912961169c7c97cecd3637b61cbf 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-31",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
index 00cdbc5a719627f1b0e355871f9ff35c88bd7ce3..0073d8bfbe41ca64703fd741258398be6e7f9bf4 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-32",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
index 827055712c7af1cf9b834bbe6989d419e80f477a..2c050723828da8af4b8664f89268dd1a3429b340 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-33",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
index 39990b5fd4368abd2cb083d8200bf61639f9bee0..a534c572c3bb76a3b7461e582c98f7dbe6201511 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-34",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
index 3a3025415644ff8aa60fe34157432518cdc02a8e..14ba6fb39593f467fea1d6be04e6cf7f56a50f0d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-35",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
index 6dcc253d267c86cc450b2f3bb5106b9ae3aebe0c..96d9b965f260ea975ab0f7a9bb08520fa82604c7 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-36",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
index eb2ba7d65b789ea850613cc4ef534a7a76d27900..0a1b7befc190ce7e60fa7fd270a79f1dc7d390d3 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-37",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
index f8748bbb06ed6bd211e06ceaee69ccda6ceedfc4..ad58baf7895ea84389f2562197b5f0e0d79f03b0 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-38",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
index 529d8084471e2d094d925160684bca69e91d81c2..78a68a0d59cd13a70e45dda7fdb5538190ef67d5 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-39",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
index 54abdcaa70a0438d8749c571c39d4c7c5000c6a8..83d91ff80ef1baca2b1258d2a4f33311b3c1a96b 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-4",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
index 502b9fa4c85a34b8b43703e1a43544394965ca9a..9241c75b07e24c4dc6a3fa793551ff5168ecd12e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-40",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
index d0a5670506b41cb1f728318d08589ffdab6b7382..83de2e91423919b94bcdc81df6d8a640f00ba048 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-41",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
index 8d76dcf82754eda8402c762f8f52d60ec3ec37a8..f0ee5bb16709386a4ac97d0f6a0943dc20750235 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-42",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
index c4aaab61cb02d82f3ffca5f8b8b62e3f4f9288f5..d1859e1f291cee2ce1c6332dabd91d878c10e01c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-43",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
index de9f8f97304e66f348929baef97812658098b945..90abe469a5424a114cebb1e4259cbeb7e7fd7ea2 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-44",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
index 43c5ba8f7a313472e606f4fdfbec45922ad06c9b..8d5aade9095ae842dd03199a6bcb63c70ab9fbed 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-45",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
index a5745c49e84f76e33d84b392c66f59d29dc90d7b..441ea66bfcb2e1f5f1da52ee451dce686ec2421c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-46",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
index 9899abc85a38b0e5658fb79fece42659fca5e015..cbbf7868586b37a07ee1214f1e4280908a65547e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-47",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
index b186282e6957256a874fd275af30fea2ed1ae87e..008361bfa3eb6b43d4eae724123fae13ea7fa302 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-48",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
index d97b85be893a6ee35f8c9627fe2f7f8fea61c0f1..1396abfa6349256d62bd30b7fa882991a61ed66f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-49",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
index 7f25956f21ddb7a5bfcdaa0e02d83526ae699140..427901b47bc10093e09ab26ba169f1b5a4e9156a 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-5",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
index 61cb8d07e412bc2bcf1c91a9cee161edddf82daa..094ba854c0fe4d778f710b969dd89431cd27483a 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-50",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
index c8be7df8dea0399886b3a29415801a4633e8cdd5..7a81257fdb5b656f44b0eefe02289c4a0a2db41d 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-51",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
index 4e922b1fffea20ab4419df8fd9244b35a5328676..d290bc1cf89490a659ef491204b90a2bee02ad20 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-52",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
index 393954d8eefbf177fa0200bc3b6eb75fc574fb74..ea019dc014f457fc5eccedc22d13c655d364681a 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-53",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
index e8c77b0d42cce89b2fe611704f354ca0232cef8b..79dd278e1da5f5aabadbf8d2d77bdc576990eb5e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-54",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
index aa038442e822acb87ed50f488a429581bab9ca95..f9d88077e2c3b47c94b45d90cc5eee439270c036 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-55",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
index 53c8a7aa687f06136ae9a5f2c943ea153e2c9bc6..f4b1bb867abded91a4f14f093f9673afb846b474 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-56",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
index ea3e1555eec13508c9282c12965d31d6fb8fcd29..bce617ecf4954faac6a7645a9fe858401cab2816 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-57",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
index f85930c3f27a2a946bb2bbdc379731825187fb69..59bc859a63a8390ad48396a49123ba1c3268501c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-58",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-58"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
index b3ebc8459cd7e9d1e6def64da72e59bf7d1515ae..bba8b268cc5aa8932fe3457c8574e96022dc9283 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-59",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-59"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
index c8676d07780e75f54d3b568b89ff1969c668bfcf..d24798a8cbacff74341b04096e55ced9ae39deb8 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-6",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
index 053c8620bcb7bbc5f96da062c61cd1d401dd86a0..7bac28320e2324e3c9c24dd7da0a0f5048a307bd 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-60",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-60"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
index a9ca1ecbc58f17851718246167aeb09447337683..33773d28c97c53c94a9dc975033d5b35efb81132 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-61",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-61"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
index bc8a9b50f38ce3f7cac151591fbfa2377f0fe942..da351f308d3039ffe614702aaf86d190b600d5a9 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-62",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-62"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
index ceb03a9ca70eeae7825f3eb5a193c0ca240bdee2..03a74452eaa9b3a0e95828cd75f180dd5c7782b9 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-63",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-63"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
index 0de803b6cd343e0697150983a4a3381aeb8ce915..14d728a1bf83da97f3662fc6e4d3871388356795 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-64",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-64"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
index a177c83bdd1a056d0ac8d7d08800d751b5700b87..7ff276aa8c0a277d487c3dca33ca8dec07ad23bf 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-65",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-65"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
index a2ec80e6bf6642cc79b2cf3ccdf6e2071014d6fd..ef44ab3b48dd630ff9826537a00f38baf7b12fc4 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-66",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-66"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
index b14c4d8c0aa870f30cd0cfcb0775d16e86004e94..c0b39f82953fb696efcdbbca9aacadbc54a2b744 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-67",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-67"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
index 449dd8214a55c26ebae5f1bbda2149528941c609..a0bcb69236ea5409a4c135ce282de665adf15854 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-68",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-68"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
index b4d5e74950a4b0fb47a206b52e366e013f54d1ff..e1018033dac57b8144620f8715992e8c66be615c 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-69",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-69"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
index b18234f08a4843e1cd8256610d464368da8f4493..0528d4ab1376ef73744d1f1b2a08aca11901f914 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-7",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
index 955fc780e89d42689f83beb603b20f032f7c482a..a6299e49edfaae514bcac8c716380bffde52a3b9 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-70",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-70"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
index 10ac2dbb15e0547dad6463f21957180045d9703b..c320ff9ffa3d6b70c722dd6688d9081653eebe66 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-71",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-71"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
index 0b70fc963fb6cd09fa2b53ffc72872e19094b55c..b0b6ad6e6046e19118118626bced805ddf232a7f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-72",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-72"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
index 0a6070dd55f0ac753f6ecf25bf320ead323b5bca..e0e09ae8dc6ce99c708fd813cbdb9d1f0e4f4bed 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-73",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-73"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
index c7d734220b3ae90891e75f1a980e026828708126..01f66b29d519fae2f9eb5e6431846bee6de5262f 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-74",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-74"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
index ca82070da53a3a33998696f4ea0411ea9b7f4a93..fbd033300cacfe68caca6f68dc1ce3cd4eff5f1e 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-75",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-75"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
index 24b898d4aa3261707e3ccf80d47b54eef837c931..575acbe1192f2b410e91177704e997ffbae70d84 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-76",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-76"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
index 0e7418e49d19a06e170ed6478ae28279810e3c2b..58232eff5de76b697e01feed56187ade9aae4372 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-77",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-77"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
index 601a34d7a2ab2addfcb6454eea77c7e7b5cf3caa..02963a44be3b846fbeaf34c590e39f4f6c6c5f9b 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-78",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-78"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
index 5408156af0b20ca9e74005f97ea1580ede968e0c..c1fa9aecba8399755185aaaec4978b2b2ddbc61b 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-79",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-79"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
index 7dbb40e7bf8d9b50efe0fc61f937e180db6cb352..8b37c2ef032fd55c0a1218c23fe089c96bd99027 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-8",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
index 7aa3f5e533c3e5444a976b60adf4ef59219e7636..61300f3c9a7e46a50ebc752e8203cbff9a255391 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-80",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-80"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
index 10206c7a42d6a2c513ac9ba7ded96f647e2ff823..f6f64b8e5a521c07c9a867f1a25d57d60607f7ed 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
@@ -1,71 +1,71 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 4,
-    "platform_type": "x86_64"
+    "smt_size": 4
   },
-  "processor": {
-    "cache_l1": 1048576,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2600000000.0,
-    "version": "2218",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "sata_nv",
-      "size": 232830643653.87,
-      "interface": "SATA"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 8589934592
+    "ram_size": 8589934592,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "pastel-9",
   "network_adapters": [
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "forcedeth",
-      "vendor": "NVIDIA",
-      "rate": 1000000000,
-      "version": "MCP55 Pro",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "NVIDIA",
+      "version": "MCP55 Pro"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     },
     {
       "driver": "tg3",
-      "vendor": "Broadcom",
-      "rate": 1000000000,
-      "version": "BCM5715c",
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000,
+      "vendor": "Broadcom",
+      "version": "BCM5715c"
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": 1048576,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2600000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "2218"
+  },
+  "storage_devices": [
+    {
+      "driver": "sata_nv",
+      "interface": "SATA",
+      "size": 232830643653.87
+    }
+  ],
+  "type": "node",
+  "uid": "pastel-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/pastel.json b/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
index 18ca6990d56a80d85e1501f0621236fb05e746be..718868c8ab8fa0d5820270ba8333c9b3dca41ffd 100644
--- a/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
+++ b/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
@@ -1,6 +1,6 @@
 {
+  "date_of_arrival": 1196290800,
   "model": "Sun Fire X2200 M2",
   "type": "cluster",
-  "date_of_arrival": 1196290800,
   "uid": "pastel"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json
index 09edcb7021e7406243ad85f77272e0fa313bf8d9..a8570e8f728e99ff3ca54c72009c577a644ea99b 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-1.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-1",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-1"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json
index 151d0a290638e08eb7e0d402ba0d07b8160d2144..2686c62b9a7bf3e9ad8a17f3fd26df6bcba0cbc1 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-10.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-10",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-10"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json
index 028b36382d558bfdb6e6b8322e698bdb295b77d1..75cc2660aabffb489a03891addd7776ba4d86866 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-11.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-11",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json
index 979cc581419737e4f7f1d2b88d79705294b23964..3ac2023c7915c0a8b58f62168e8dcbf4d0ea9a67 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-12.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-12",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-12"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json
index 48cbf68091cf713456c1f563fa5bd013c9795121..2071d9e51dac2ef736113e216ecfa6f1fe2f0138 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-13.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-13",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-13"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json
index c9a9fca2ccfde872d81a95a80628406b98352efc..1def7c66656aabf6b5e72d8900c54516ff33594b 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-14.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-14",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-14"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json
index 2d983609ef7f4937c659d06509bc6477327c9e09..a98f5813e3e6a197f86bdff11900a6b6e6fd6b71 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-15.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-15",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json
index 6f40e2682320f4cb7c6fbe155c4eff61ffa40cf9..66d5da0cdb7dbdfe993a3bafde624b4d09652546 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-16.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-16",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-16"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json
index 81c59708b78e1d14dee5b9a99185de6d24b36363..323ccc41b68fae93dc48f3d53897b664d5214c6a 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-17.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-17",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-17"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json
index a79150d2f59bcb92d39b9b533ad2d72cbb976104..6fec65da9e2f7056465ab653c38e3cbdc88a96ae 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-18.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-18",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-18"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json
index 09860a6d337fd723844cb0133733a945e08db7e1..53330eb7a7dc43cb0ff6902000e3435b7aa96c7c 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-19.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-19",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-19"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json
index 813ba1d0f5fd02fc9ad3a546aad39a4c07b1b87c..436a358e75bd49a9f43e2c091fbf7c717ed06fee 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-2.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-2",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-2"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json
index 698099693f65a76e0ee0948d89bbdf1ae2daf0cf..d1af5009c5c9f06dab9817de04e55c1c0f9dba5e 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-20.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-20",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-20"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json
index 85bc92ed95bc9e022625cfa31f969051ced2d2f8..0af019522f011675766715648e279976eb8824e0 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-21.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-21",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-21"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json
index e3b5c01a9b3f6d6a4d5fd03355d687625202ef21..05bdad243f6ff1ae4406399476f3ce846547b32b 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-22.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-22",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-22"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json
index 958082d6790a022eb01b558672e1779909b4cddd..61de62a11095aeb8478f2ffcf761455e69e49669 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-23.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-23",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-23"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json
index dff38badb595d99a504c6a44d97a0ee0c3438cc4..6fe7b3cb25a787884535ad45f711b4bdce8ac204 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-24.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-24",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-24"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json
index bfd7ad48c4386c45b5f23206272cd719d93fac1d..f2ae433f1cfa358c51d9076ca02d40e57dcf03e2 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-25.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-25",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-25"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json
index 752134920253820329d688457777b17e1ae13a2c..823c17f8dface282220096e4adb7f7181d53ecc8 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-26.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-26",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-26"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json
index 7ed84ea926e605426f9221951435c19e21da8dbc..99af127ffa5990ebaf09e90710a0b34c6ff489a3 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-27.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-27",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json
index 447489721c8ff1eff254e9dfe7b3e414d384020a..32f2f8319cd4a31974b5566b9fdbfada90ae267b 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-28.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-28",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json
index a517d8dd7a0a5008f39422c0e44a824dfb9ec20e..ec7f7b0359ebf3307a87d2941b0c2cfa6b4b6e0e 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-29.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-29",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-29"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json
index 4827c228b5d7d1ae8c80e00a97a7b9259dc79879..33a615e309d53215a67278db1a019261b9f823e6 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-3.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-3",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-3"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json
index a3ac286a7b0e82d9880c03cec3a5eb65bdceaad1..ed6f197014520072ae809bcacf3386ee52da1b2c 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-30.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-30",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json
index 0aba78eec78f26543c79f057e285c8166d963568..d8e0d66a86be613624c80a7f63a8f5c1fd7a8efc 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-31.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-31",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-31"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json
index a6ba803816dd851d04f9625c950d2384d49acc82..2ce971a234784a50cb413498affe2c31109eeb0b 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-32.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-32",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-32"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json
index 7e942724e0cc61ce6d6921480224eaef091fea21..3ba874194ef99664207118bd5bc3c56a35d8fb46 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-33.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-33",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-33"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json
index 5be05358ee89127f6357615ffa15179737e40bf8..0470f49487ba48f2b70390d08f371ca75fb9270f 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-34.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-34",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-34"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json
index 81a266d23c6604ff6e67e11453199882a5279469..6d14b6c15772341825da1df0a28d761f4726e753 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-35.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-35",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-35"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json
index e650c2a45054c23b905c47185506d626cb9a6090..b96a69dddb1d0930a2c46f82fad060ea9e78ce34 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-36.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-36",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-36"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json
index f1201c1756586293353e32affaf447f11c5ffbf3..55f4a464372162e8bc07378a2fc4d08faa0f9719 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-37.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-37",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-37"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json
index 3a8f02d500ff1eff65dbc13e053cd699d37860d9..f068ccd89498d7bdad04d006a29ccec16d39c87b 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-38.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-38",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-38"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json
index 755251ea79d994212f7859e3f517bce920c673d2..4836bf51e825779c2a4636dfba470ca4b0d575f9 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-39.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-39",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-39"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json
index 0f0e98a6f4e19fb01d6779ef4014c90aa1704f66..21c0d85e48e4e80931402e05512190f82059291c 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-4.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-4",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-4"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json
index b91f41e268866d4c8f35e5e3aa3b36f85a3fc63e..399d9a7ec4d5e511d8cb8e398a0eff2bef213d8c 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-40.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-40",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-40"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json
index a76e914a8ece2f5552b1ba001a4f198226f2af60..ca40e04a7a4477fd7fe3291306daf56b0b8a02a2 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-41.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-41",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-41"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json
index eef48c92050be4c22bb7fc5f6ec863740a673b3b..bb1ecb50864b2448ba98ad0028b5f673f093003c 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-42.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-42",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-42"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json
index 639d6c3d8cbc35df0a427ec4b15cf64a1adbaaac..cb9b2a518732dcd2f01561a1fdeeb3cbe8e58e52 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-43.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-43",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-43"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json
index 38048d0951c481f52f6b1b1d7f48f9f37620ae53..3a7b719d5acaf46dc6b80217ecdcffcf1151e3ea 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-44.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-44",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-44"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json
index cf4316f61604c8f982e1812c3dc2537426583b8b..b09cd6fcbff3336aa541252c06852df69e55c401 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-45.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-45",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-45"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json
index 5c76d8b26ece866299c95d2e39e17d4f95e48385..29cb247569b4cb9eb7ffc40ecba49761511312f7 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-46.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-46",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-46"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json
index b66c71c734835acd0d3cd6f727c16783ec54f428..0d27541f888d5f3e91da672071929fbf7ebd0776 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-47.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-47",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-47"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json
index 2cc4668bc8d0012c0c0d702920ef38caddd6676b..713ed3732acd41b702916d60f73a3be171c5150e 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-48.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-48",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-48"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json
index be22397b4121e158089ce816501609f760620c57..05084228feb586e7c2a8c6fe3acc7bf79903da9e 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-49.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-49",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-49"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json
index b6de5041e973d05cd1e7ae3697c5fb54a4702993..4e087af967caab220f27455e00bd4b5adf4c0f43 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-5.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-5",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-5"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json
index 811427e6d43f4945eba10a4301f34d37b368b2fa..80f5bb6bbbfe0317c7361a0a3cc04352be67097a 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-50.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-50",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-50"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json
index a2c1ff19c31716a32ebac9d87bc752eac8e92d2b..f330cc0cbf3fed606773eb5e6a1d52f38a9f5bc8 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-51.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-51",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-51"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json
index eb732fe4f3bd73e9f2366a72f24a9fe348ac5d87..97ad7d7ff65f2acfd867f1f8fafd1498c84afb6d 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-52.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-52",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-52"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-53.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-53.json
index b9cfce833f357c71babdd1574a8327b0588413e7..cde1a6078a16e4fa9afd870aec85eb907dc384e7 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-53.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-53.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-53",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-53"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-54.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-54.json
index 51d110d92ab73120e1c36877198ac93bd7cbb108..b62359d2b8ee472f87af4fab6c0453a237b98b30 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-54.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-54.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-54",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-54"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-55.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-55.json
index 0f421bc8b92bf113523da8a235d34658b48760fc..4dba58ef6cf5ae6c829882df00b91004fac6aeec 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-55.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-55.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-55",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-55"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-56.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-56.json
index 4b948e50992670b8d40a27b5fb46da7cb30d4c23..39282801d9df8c4ae49d14980b106e5addb7f245 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-56.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-56.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-56",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-56"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-57.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-57.json
index de470cc7b35543996907b0eaa8290e23513f3fa3..bba06fad7d1685c849476ae1290578e7343c186c 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-57.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-57.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-57",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-57"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json
index 2b8b73a149291553311872097fd17ec4f0cc505f..0e90da4653f821c13d8f6fdd9f8d42592ee2e9e2 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-6.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-6",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-6"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json
index d5f83e2191da6817e0ab48956623b2fa51c63ba4..f935b6d5837550aeee7d4dcd6680ba34dae4d80e 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-7.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-7",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-7"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json
index 159fb7d557b126bbfb2b89bae9dd8da9e4d9f411..3639039e6568dfe5f50064ece3479765763162dd 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-8.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-8",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-8"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json
index d893c1cca90280b7d95358c6eebc0535bc4bd924..e33815c5855d18b5acfa17ad9f89bea44ec26326 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/nodes/violette-9.json
@@ -1,51 +1,51 @@
 {
   "architecture": {
+    "platform_type": "x86_64",
     "smp_size": 2,
-    "smt_size": 2,
-    "platform_type": "x86_64"
+    "smt_size": 2
   },
-  "processor": {
-    "cache_l1": null,
-    "model": "AMD Opteron",
-    "cache_l1i": null,
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "version": "248",
-    "cache_l2": null,
-    "instruction_set": "",
-    "other_description": ""
-  },
-  "storage_devices": [
-    {
-      "driver": "mptspi",
-      "size": 67986547946.9299,
-      "interface": "SCSI"
-    }
-  ],
   "main_memory": {
-    "virtual_size": null,
-    "ram_size": 2147483648
+    "ram_size": 2147483648,
+    "virtual_size": null
   },
-  "type": "node",
-  "uid": "violette-9",
   "network_adapters": [
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": true,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
       "driver": "tg3",
-      "rate": 1000000000,
       "enabled": false,
-      "interface": "Ethernet"
+      "interface": "Ethernet",
+      "rate": 1000000000
     }
   ],
   "operating_system": {
-    "version": null,
+    "name": null,
     "release": null,
-    "name": null
-  }
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": null,
+    "clock_speed": 2200000000.0,
+    "instruction_set": "",
+    "model": "AMD Opteron",
+    "other_description": "",
+    "vendor": "AMD",
+    "version": "248"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptspi",
+      "interface": "SCSI",
+      "size": 67986547946.9299
+    }
+  ],
+  "type": "node",
+  "uid": "violette-9"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/violette/violette.json b/data/grid5000/sites/toulouse/clusters/violette/violette.json
index 6bda3b84e1d261b5001b6cdf6cdfcdb8c4029370..90dcb436d396bf4d55072e904fbf2b55779260a9 100644
--- a/data/grid5000/sites/toulouse/clusters/violette/violette.json
+++ b/data/grid5000/sites/toulouse/clusters/violette/violette.json
@@ -1,6 +1,6 @@
 {
+  "date_of_arrival": 1093989600,
   "model": "Sun Fire V20z",
   "type": "cluster",
-  "date_of_arrival": 1093989600,
   "uid": "violette"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json b/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json
index 290ebe665278ee25672311c94ad0d7d74b46ea80..7b65b8140877dd0c7c19cc40817a968ab2fae4b1 100644
--- a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json
@@ -1,13 +1,4 @@
 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/toulouse.json b/data/grid5000/sites/toulouse/toulouse.json
index 59d47550f795ac7a8bc56eb896e4fa8d12c56f12..337d91ec48a9f20413c47a616c907e88186dee23 100644
--- a/data/grid5000/sites/toulouse/toulouse.json
+++ b/data/grid5000/sites/toulouse/toulouse.json
@@ -1,14 +1,14 @@
 {
+  "description": "",
   "email_contact": null,
-  "longitude": null,
-  "user_support_contact": null,
   "latitude": null,
-  "security_contact": null,
-  "web": null,
-  "description": "",
+  "location": "Toulouse, France",
+  "longitude": null,
   "name": "Toulouse",
+  "security_contact": null,
   "sys_admin_contact": null,
   "type": "site",
   "uid": "toulouse",
-  "location": "Toulouse, France"
+  "user_support_contact": null,
+  "web": null
 }
\ No newline at end of file
diff --git a/generators/grid5000.rb b/generators/grid5000.rb
index 0bb58bc670a5280e7720c65b4116090e27d377e5..87f5d978761966bbee2b08c0a92905856290f6d5 100644
--- a/generators/grid5000.rb
+++ b/generators/grid5000.rb
@@ -1,7 +1,7 @@
 require 'pp'
 require 'rubygems'
 require 'fileutils'
-require 'json'
+require 'json/pure'
 require 'time'
 require File.dirname(__FILE__)+'/lib/core_extensions'
 require File.dirname(__FILE__)+'/lib/g5k_generator'
@@ -19,8 +19,10 @@ usage = %{
 simulation_mode = !$*.delete("-s").nil?
 if $*.empty?
   puts usage
+  exit 1
 elsif ($*.map{|file| File.exists?(file) && File.extname(file) == ".rb"}.include? false)
   puts "Error: your input files do not exist or are not ruby files (.rb extension)."
+  exit 1
 else
   description_files = $*
   puts "[Input files:\t\t #{description_files.join(", ")}]"
@@ -29,4 +31,5 @@ else
   data = generator.generate
   directory_to_write = File.expand_path File.join(File.dirname(__FILE__), "../data")
   generator.write(directory_to_write, :simulate => simulation_mode)
+  exit 0
 end
\ No newline at end of file
diff --git a/generators/input/rennes.rb b/generators/input/rennes.rb
index 977e72ef3dc9817455bcb5dea827235eae57d3ba..bd01f3d13b61af7fed1c20d3dc07a429df18b744 100644
--- a/generators/input/rennes.rb
+++ b/generators/input/rennes.rb
@@ -55,7 +55,7 @@ site :rennes do
       end
     end
   end
-  
+
   cluster :paramount do
     model "Dell PowerEdge 1950"
     created_at Time.parse("2007-09-01").to_i
diff --git a/generators/lib/core_extensions.rb b/generators/lib/core_extensions.rb
index 7d6b90b9d19f4254d5d0e560751461ba4fd00728..4b3dceb51a731031e2287ffed9971ce2b75b9065 100644
--- a/generators/lib/core_extensions.rb
+++ b/generators/lib/core_extensions.rb
@@ -1,4 +1,3 @@
-
 class Numeric
 
   def TB(correct = true)
@@ -31,4 +30,65 @@ class Hash
   def recursive_merge!(h)
     self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.recursive_merge!(_new) else _new end  }
   end  
+  
+  
+  # Returns a JSON string containing a JSON object, that is unparsed from
+  # this Hash instance.
+  # _state_ is a JSON::State object, that can also be used to configure the
+  # produced JSON string output further.
+  # _depth_ is used to find out nesting depth, to indent accordingly.
+  # 
+  # Contrary to the original implementation, the keys are *sorted*.
+  # 
+  def to_json(state = nil, depth = 0, *)
+    if state
+      state = JSON.state.from_state(state)
+      state.check_max_nesting(depth)
+      json_check_circular(state) { json_transform(state, depth) }
+    else
+      json_transform(state, depth)
+    end
+  end
+
+  private
+
+  def json_check_circular(state)
+    if state and state.check_circular?
+      state.seen?(self) and raise JSON::CircularDatastructure,
+          "circular data structures not supported!"
+      state.remember self
+    end
+    yield
+  ensure
+    state and state.forget self
+  end
+
+  def json_shift(state, depth)
+    state and not state.object_nl.empty? or return ''
+    state.indent * depth
+  end
+
+  def json_transform(state, depth)
+    tmp_hash = {}
+    self.each do |key, value|
+      tmp_hash[key.to_s] = value
+    end
+    delim = ','
+    delim << state.object_nl if state
+    result = '{'
+    result << state.object_nl if state
+    result << tmp_hash.sort.map { |(key,value)|
+      s = json_shift(state, depth + 1)
+      s << key.to_s.to_json(state, depth + 1)
+      s << state.space_before if state
+      s << ':'
+      s << state.space if state
+      s << value.to_json(state, depth + 1)
+    }.join(delim)
+    result << state.object_nl if state
+    result << json_shift(state, depth)
+    result << '}'
+    result
+  end
+  
 end
\ No newline at end of file
diff --git a/generators/lib/g5k_generator.rb b/generators/lib/g5k_generator.rb
index 857f862e969508f8d6de4678f1ef97556a6aa5aa..6cea2ed90e522b3a87bc2ea48d0ef7643f599f20 100644
--- a/generators/lib/g5k_generator.rb
+++ b/generators/lib/g5k_generator.rb
@@ -108,9 +108,10 @@ class ReferenceGenerator
         FileUtils.mkdir_p(full_path) unless options[:simulate]
       end
     end
+    require 'pp'
     groups.has_key?(G5K::Tree) and groups[G5K::Tree].each do |file|
       full_path = File.join(repository, file.path)
-      new_content = JSON.pretty_generate(file.contents.rehash)
+      new_content = JSON.pretty_generate(file.contents)
       existing_content = File.exists?(full_path) ? File.open(full_path, "r").read : ""
       if new_content.hash != existing_content.hash
         puts "File to be written      = \t#{full_path}"