diff --git a/lib/refrepo/gen/wiki/generators/oar_properties.rb b/lib/refrepo/gen/wiki/generators/oar_properties.rb
index 5c86bb31c8e335bbb5f91ba5e2ae49dd76dd99bb..29dfd745e01cd8f759fa7c3c15a445a1807d883f 100644
--- a/lib/refrepo/gen/wiki/generators/oar_properties.rb
+++ b/lib/refrepo/gen/wiki/generators/oar_properties.rb
@@ -46,6 +46,10 @@ class OarPropertiesGenerator < WikiGenerator
       "description" => "The ID of the CPU the resource is part of. The unique scope is the OAR server. ",
       "possible_values" => "1, 2, 3, ..."
     },
+    "cpuset" => {
+      "description" => "CPU hardware identifier (useful for gnu-parallel).",
+      "possible_values" => "0, 1, 2, 3, ..."
+    },
     "disk" => {
       "description" => "Id of a reservable disk on a node, for resources of type 'disk'.",
       "possible_values" => "sdb.yeti-1, sdc.yeti-1, sdd.yeti-1, ..."
@@ -58,6 +62,10 @@ class OarPropertiesGenerator < WikiGenerator
       "description" => "The ID of the GPU the resource is part of. The unique scope is the OAR server. ",
       "possible_values" => "1, 2, 3, ..."
     },
+    "gpudevice" => {
+      "description" => "GPU hardware identifier (useful for gnu-parallel).",
+      "possible_values" => "0, 1, 2, 3"
+    },
     "host" => {
       "description" => "The full hostname of the node the resource is part of",
       "possible_values" => "dahu-1.grenoble.grid5000.fr, ..."
@@ -165,7 +173,7 @@ class OarPropertiesGenerator < WikiGenerator
   #Group properties by categories
   @@categories = {
     "Job-related properties" => ["besteffort", "deploy", "production", "cluster_priority", "max_walltime"],
-    "Hierarchy" => ["chassis", "cluster", "cpu", "core", "disk", "diskpath", "gpu", "host", "network_address", "slash_[16-22]", "switch", "vlan"],
+    "Hierarchy" => ["chassis", "cluster", "cpu", "cpuset", "core", "disk", "diskpath", "gpu", "gpudevice", "host", "network_address", "slash_[16-22]", "switch", "vlan"],
     "Hardware" => ["gpu_model", "gpu_count", "memnode", "memcore", "memcpu", "disktype", "disk_reservation_count", "myri_rate", "myri_count", "myri", "ib_rate", "ib_count", "ib", "opa_rate", "opa_count", "eth_rate", "eth_count", "cpufreq", "cputype", "cpucore", "cpuarch", "virtual", "mic"],
     "Miscellaneous" => ["wattmeter", "nodemodel", "ip", "type"]
   }