diff --git a/velbusaio/module_spec/21.json b/velbusaio/module_spec/21.json
index af6be3e7..df6b7bf4 100644
--- a/velbusaio/module_spec/21.json
+++ b/velbusaio/module_spec/21.json
@@ -12,162 +12,194 @@
     "01": {
       "Editable": "yes",
       "Name": "Push button 1",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "02": {
       "Editable": "yes",
       "Name": "Push button 2",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "03": {
       "Editable": "yes",
       "Name": "Push button 3",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "04": {
       "Editable": "yes",
       "Name": "Push button 4",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "05": {
       "Editable": "yes",
       "Name": "Push button 5",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "06": {
       "Editable": "yes",
       "Name": "Push button 6",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "07": {
       "Editable": "yes",
       "Name": "Push button 7",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "08": {
       "Editable": "yes",
       "Name": "Push button 8",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "09": {
       "Editable": "yes",
       "Name": "Push button 9",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "10": {
       "Editable": "yes",
       "Name": "Push button 10",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "11": {
       "Editable": "yes",
       "Name": "Push button 11",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "12": {
       "Editable": "yes",
       "Name": "Push button 12",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "13": {
       "Editable": "yes",
       "Name": "Push button 13",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "14": {
       "Editable": "yes",
       "Name": "Push button 14",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "15": {
       "Editable": "yes",
       "Name": "Push button 15",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "16": {
       "Editable": "yes",
       "Name": "Push button 16",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "17": {
       "Editable": "yes",
       "Name": "Push button 17",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "18": {
       "Editable": "yes",
       "Name": "Push button 18",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "19": {
       "Editable": "yes",
       "Name": "Push button 19",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "20": {
       "Editable": "yes",
       "Name": "Push button 10",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "21": {
       "Editable": "yes",
       "Name": "Push button 21",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "22": {
       "Editable": "yes",
       "Name": "Push button 22",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "23": {
       "Editable": "yes",
       "Name": "Push button 23",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "24": {
       "Editable": "yes",
       "Name": "Push button 24",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "25": {
       "Editable": "yes",
       "Name": "Push button 25",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "26": {
       "Editable": "yes",
       "Name": "Push button 26",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "27": {
       "Editable": "yes",
       "Name": "Push button 27",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "28": {
       "Editable": "yes",
       "Name": "Push button 28",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "29": {
       "Editable": "yes",
       "Name": "Push button 29",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "30": {
       "Editable": "yes",
       "Name": "Push button 30",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "31": {
       "Editable": "yes",
       "Name": "Push button 31",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "32": {
       "Editable": "yes",
       "Name": "Push button 32",
-      "Type": "Button"
+      "Type": "Button",
+      "Subdevice": "yes"
     },
     "34": {
       "Editable": "yes",