diff --git a/spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json
index 4d2e2e5f805b2032c02389abbe451f65b6b616bc..8be0817345c717fcd23f878534d8dc32a1ef7fed 100644
--- a/spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json
+++ b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json
@@ -9,7 +9,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -21,7 +22,6 @@
                 "name": "PowerEdge T640",
                 "serial": "FL1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -216,7 +216,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -228,7 +229,6 @@
                 "name": "PowerEdge T640",
                 "serial": "9L1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -812,4 +812,4 @@
   },
   "type": "grid",
   "uid": "grid5000"
-}
\ No newline at end of file
+}
diff --git a/spec/stub_oar_properties/load_data_hierarchy_stubbed_data_with_disk.json b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data_with_disk.json
index 4d67c8d2138cc5bddb51f159b82000f20a7531bc..b5e6f7e00b06ed3e09ca82fcfc714e1b5a03f2e6 100644
--- a/spec/stub_oar_properties/load_data_hierarchy_stubbed_data_with_disk.json
+++ b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data_with_disk.json
@@ -9,7 +9,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -21,7 +22,6 @@
                 "name": "PowerEdge T640",
                 "serial": "FL1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -230,7 +230,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -242,7 +243,6 @@
                 "name": "PowerEdge T640",
                 "serial": "9L1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -464,7 +464,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -476,7 +477,6 @@
                 "name": "PowerEdge T640",
                 "serial": "9L1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -724,7 +724,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -736,7 +737,6 @@
                 "name": "PowerEdge T640",
                 "serial": "FL1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
diff --git a/spec/stub_oar_properties/load_data_hierarchy_stubbed_data_without_gpu.json b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data_without_gpu.json
index 88f43f9bb1519ddf38045bed9f5b2c67ebf6ba91..c2f88457f0b20b7356e7660492c6f6eb1a851d6d 100644
--- a/spec/stub_oar_properties/load_data_hierarchy_stubbed_data_without_gpu.json
+++ b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data_without_gpu.json
@@ -9,7 +9,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -21,7 +22,6 @@
                 "name": "PowerEdge T640",
                 "serial": "FL1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -230,7 +230,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -242,7 +243,6 @@
                 "name": "PowerEdge T640",
                 "serial": "9L1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -464,7 +464,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -476,7 +477,6 @@
                 "name": "PowerEdge T640",
                 "serial": "FL1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -686,7 +686,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -698,7 +699,6 @@
                 "name": "PowerEdge T640",
                 "serial": "9L1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -921,7 +921,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -933,7 +934,6 @@
                 "name": "PowerEdge T640",
                 "serial": "9L1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,
@@ -1181,7 +1181,8 @@
                 "nb_cores": 16,
                 "nb_procs": 2,
                 "nb_threads": 32,
-                "platform_type": "x86_64"
+                "platform_type": "x86_64",
+                "cpu_core_numbering": "continuous"
               },
               "bios": {
                 "release_date": "06/14/2019",
@@ -1193,7 +1194,6 @@
                 "name": "PowerEdge T640",
                 "serial": "FL1CBX2"
               },
-              "cpuset_mapping": "continuous",
               "gpu": {
                 "gpu": true,
                 "gpu_cores": 17408,