diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
index 1b914c918bd88e7bfaba6f9244ff7d2a0d14dac9..f9e4a713a2eee1e5b3071930c0cea48fa7a4e64b 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "FL1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:3f:64",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:3f:65",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.1",
-      "kavlan": false,
       "mac": "f8:f2:1e:60:41:20",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-1.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet6/39",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:41:21",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.1",
-      "kavlan": false,
       "mac": "f4:02:70:9a:3f:74",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-1-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 1,
+            "uid": "graffiti-pdu1"
+          },
+          {
+            "port": 1,
+            "uid": "graffiti-pdu2"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aefea00024afe4c307e10af8",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-1"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
index 9b9b23a1c049c9325bdcef44c9752f1b5445bf30..88c7938bb4f6f5509d9b5bd4f3d58186a91551ab 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "GL1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "4c:d9:8f:33:d7:dc",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "4c:d9:8f:33:d7:dd",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.10",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a7",
+      "mac": "f8:f2:1e:60:2b:c0",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-10.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet7/44",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:2b:c1",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.10",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a7",
+      "mac": "4c:d9:8f:33:d7:ec",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-10-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 7,
+            "uid": "graffiti-pdu3"
+          },
+          {
+            "port": 7,
+            "uid": "graffiti-pdu4"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aee1d70024a7bff804ec6e41",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-10"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
index ba406f488ab44411e4193db4af8012b5e1428286..8beaa4b763171268a5f6be647c7e7bcbe76df1a8 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "JL1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "4c:d9:8f:2d:3c:78",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "4c:d9:8f:2d:3c:79",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.11",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a8",
+      "mac": "f8:f2:1e:60:3f:90",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-11.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet7/43",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:3f:91",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.11",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a8",
+      "mac": "4c:d9:8f:2d:3c:88",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-11-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 13,
+            "uid": "graffiti-pdu3"
+          },
+          {
+            "port": 13,
+            "uid": "graffiti-pdu4"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aeff5e0024a7bfd604d35be4",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-11"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
index 18e8e4a1ed361662e01f621988c1a439057ab4af..403624fcda37e280325e3330db6d7f1b6b9d189a 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "HL1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "4c:d9:8f:2d:4d:3a",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "4c:d9:8f:2d:4d:3b",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.12",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a9",
+      "mac": "f8:f2:1e:60:32:00",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-12.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet7/45",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:32:01",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.12",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a9",
+      "mac": "4c:d9:8f:2d:4d:4a",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-12-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 17,
+            "uid": "graffiti-pdu3"
+          },
+          {
+            "port": 17,
+            "uid": "graffiti-pdu4"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aee17b0024a7bff104dc6471",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-12"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
index 4214341d47ee90e4ca17522652e543e168c2b7e8..7a76bf2294401e4c0494c118f5f0b6b884a0cd97 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "7K1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:4b:f0",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:4b:f1",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.13",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:aa",
+      "mac": "f8:f2:1e:60:57:60",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-13.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet7/41",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:57:61",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.13",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:aa",
+      "mac": "f4:02:70:9a:4c:00",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-13-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 21,
+            "uid": "graffiti-pdu3"
+          },
+          {
+            "port": 21,
+            "uid": "graffiti-pdu4"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aefd8f0024a7bfe304e28a0a",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-13"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
index 4b258e733ebc4ec7a4d8dd416f7de66fc7b33573..b9ac2d9229bcb9f5054220860bc9f12e3929316d 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "9L1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:48:d8",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:48:d9",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.2",
-      "kavlan": false,
       "mac": "f8:f2:1e:60:3f:a0",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-2.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet6/36",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:3f:a1",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.2",
-      "kavlan": false,
       "mac": "f4:02:70:9a:48:e8",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-2-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 6,
+            "uid": "graffiti-pdu1"
+          },
+          {
+            "port": 6,
+            "uid": "graffiti-pdu2"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aeff430024929b4003cd51d0",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-2"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
index 8f76934ae37ca77f3902f9c148026a3991253175..967514a9e19137eb415f279a2e16ac66d6265c1f 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "BL1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:49:72",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:49:73",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.3",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a0",
+      "mac": "f8:f2:1e:60:41:90",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-3.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet6/40",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:41:91",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.3",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a0",
+      "mac": "f4:02:70:9a:49:82",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-3-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 7,
+            "uid": "graffiti-pdu1"
+          },
+          {
+            "port": 7,
+            "uid": "graffiti-pdu2"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aeff440024a3cc780477d47a",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-3"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
index 09716e2225696e01a0233afffc89e284fb90c49b..6737f14571d2fb47b81ffba1be52273017efe591 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "DL1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:4b:56",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:4b:57",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.4",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a1",
+      "mac": "f8:f2:1e:60:28:40",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-4.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet7/48",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:28:41",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.4",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a1",
+      "mac": "f4:02:70:9a:4b:66",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-4-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 14,
+            "uid": "graffiti-pdu1"
+          },
+          {
+            "port": 14,
+            "uid": "graffiti-pdu2"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aeff390024a4aab5047b5f32",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-4"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
index 6dc370468490e9aca952494fa57581f368ebab06..055efac54c2e65c1a56f7e2648796cc3857e9cdf 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "CL1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:43:c6",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:43:c7",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.5",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a2",
+      "mac": "f8:f2:1e:60:28:20",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-5.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet6/37",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:28:21",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.5",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a2",
+      "mac": "f4:02:70:9a:43:d6",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-5-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 15,
+            "uid": "graffiti-pdu1"
+          },
+          {
+            "port": 15,
+            "uid": "graffiti-pdu2"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aeff410024968a9d0538bf26",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-5"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
index e4cf5983de289233a8801d736fd5d33c053d2f3e..a1fe6c4d0f68a0aaeb60dee3e90d600328239a1e 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "8K1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:41:a0",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:41:a1",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.6",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a3",
+      "mac": "f8:f2:1e:60:57:70",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-6.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet6/38",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:57:71",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.6",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a3",
+      "mac": "f4:02:70:9a:41:b0",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-6-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 21,
+            "uid": "graffiti-pdu1"
+          },
+          {
+            "port": 21,
+            "uid": "graffiti-pdu2"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aefe4c0024955d700575177b",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-6"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
index 58c21ee086488efb1aeb068a4fb7421460c9df66..508be689e0ad2845be4654ac1f7a1c4f9aac97dc 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "BK1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:42:92",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:42:93",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.7",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a4",
+      "mac": "f8:f2:1e:60:26:80",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-7.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet6/35",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:26:81",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.7",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a4",
+      "mac": "f4:02:70:9a:42:a2",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-7-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 23,
+            "uid": "graffiti-pdu1"
+          },
+          {
+            "port": 23,
+            "uid": "graffiti-pdu2"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aeff3f00249d84d7048679f0",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-7"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
index b0b27386c71fee7c4851549629e8d806247b0283..eb26f5a5a92df9010ce513723a6a3df41da6a145 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "CK1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:3f:fe",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:3f:ff",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.8",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a5",
+      "mac": "f8:f2:1e:60:35:30",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-8.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet6/34",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:35:31",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.8",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a5",
+      "mac": "f4:02:70:9a:40:0e",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-8-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 3,
+            "uid": "graffiti-pdu3"
+          },
+          {
+            "port": 3,
+            "uid": "graffiti-pdu4"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aefdcb0024a4ae6f048773e6",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-8"
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
index e61cfd7362bdf883670c85dc497ebd6ac481bce5..cfd8669a0ee0afdd07c265d2a010d3b57b44e0e9 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
@@ -1,4 +1,20 @@
 {
+  "architecture": {
+    "nb_cores": 16,
+    "nb_procs": 2,
+    "nb_threads": 32,
+    "platform_type": "x86_64"
+  },
+  "bios": {
+    "release_date": "06/14/2019",
+    "vendor": "Dell Inc.",
+    "version": "2.2.11"
+  },
+  "chassis": {
+    "manufacturer": "Dell Inc.",
+    "name": "PowerEdge T640",
+    "serial": "9K1CBX2"
+  },
   "gpu": {
     "gpu": true,
     "gpu_cores": 17408,
@@ -6,56 +22,143 @@
     "gpu_model": "RTX 2080 Ti",
     "gpu_vendor": "Nvidia"
   },
-  "kavlan": {
-  },
   "main_memory": {
+    "ram_size": 137438953472
   },
   "monitoring": {
-    "wattmeter": "false"
+    "wattmeter": "multiple"
   },
   "network_adapters": [
     {
+      "bridged": false,
       "device": "eth0",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:47:ba",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": false,
+      "device": "eth1",
+      "driver": "bnxt_en",
+      "enabled": false,
+      "firmware_version": "214.0.173/1.9.2 pkg 21.40.20.0",
+      "interface": "Ethernet",
+      "mac": "f4:02:70:9a:47:bb",
+      "management": false,
+      "model": "BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller",
+      "mountable": false,
+      "mounted": false,
+      "name": "eno2d1",
+      "vendor": "Broadcom"
+    },
+    {
+      "bridged": true,
+      "device": "eth2",
+      "driver": "i40e",
       "enabled": true,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
       "ip": "172.16.64.9",
-      "kavlan": false,
-      "mac": "ff:ea:1e:60:3f:a6",
+      "mac": "f8:f2:1e:60:21:80",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
+      "name": "enp137s0f0",
       "network_address": "graffiti-9.nancy.grid5000.fr",
-      "switch": null,
-      "switch_port": null
+      "rate": 10000000000,
+      "switch": "gw-nancy",
+      "switch_port": "Ethernet7/46",
+      "vendor": "Intel"
     },
     {
-      "device": "eth1",
+      "bridged": false,
+      "device": "eth3",
+      "driver": "i40e",
       "enabled": false,
-      "kavlan": false,
+      "firmware_version": "6.80 0x80003d72 18.8.9",
+      "interface": "Ethernet",
+      "mac": "f8:f2:1e:60:21:81",
+      "management": false,
+      "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "name": "enp137s0f1",
+      "vendor": "Intel"
     },
     {
       "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.9",
-      "kavlan": false,
-      "mac": "bf:ea:1e:60:3f:a6",
+      "mac": "f4:02:70:9a:47:ca",
+      "management": true,
       "mountable": false,
-      "mounted": false
+      "mounted": false,
+      "network_address": "graffiti-9-bmc.nancy.grid5000.fr"
     }
   ],
+  "operating_system": {
+    "cstate_driver": "intel_idle",
+    "cstate_governor": "menu",
+    "ht_enabled": true,
+    "pstate_driver": "intel_pstate",
+    "pstate_governor": "performance",
+    "turboboost_enabled": true
+  },
   "processor": {
     "cache_l1": null,
-    "microarchitecture": "Skylake"
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 1048576,
+    "cache_l3": 11534336,
+    "clock_speed": 2100000000,
+    "ht_capable": true,
+    "instruction_set": "x86-64",
+    "microarchitecture": "Skylake",
+    "model": "Intel Xeon",
+    "other_description": "Intel(R) Xeon(R) Silver 4110 CPU @ 2.10GHz",
+    "vendor": "Intel",
+    "version": "Silver 4110"
   },
   "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "api": {
+          "metric": "power"
+        },
+        "pdu": [
+          {
+            "port": 5,
+            "uid": "graffiti-pdu3"
+          },
+          {
+            "port": 5,
+            "uid": "graffiti-pdu4"
+          }
+        ]
+      }
+    }
   },
   "storage_devices": [
     {
+      "by_id": "/dev/disk/by-id/wwn-0x6f402700aeff350024a7bfd004f0af67",
+      "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "device": "sda",
       "driver": "megaraid_sas",
+      "firmware_version": 4.29,
       "interface": "SATA",
-      "model": "PERC H330",
+      "model": "PERC H330 Adp",
+      "size": 479559942144,
       "storage": "SSD",
       "vendor": "Dell (Raid)"
     }
@@ -67,7 +170,8 @@
     "queues": [
       "admin",
       "testing"
-    ]
+    ],
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "graffiti-9"