diff --git a/buffet/etc/buffet/commands/buffet.json b/buffet/etc/buffet/commands/buffet.json
new file mode 100644
index 0000000..aff9d6c
--- /dev/null
+++ b/buffet/etc/buffet/commands/buffet.json
@@ -0,0 +1,24 @@
+{
+  "base": {
+    "updateBaseConfiguration": {
+      "parameters": {
+        "localDiscoveryEnabled": "boolean",
+        "localAnonymousAccessMaxRole": [ "none", "viewer", "user" ],
+        "localPairingEnabled": "boolean"
+      },
+      "results": {}
+    },
+
+    "updateDeviceInfo": {
+      "parameters": {
+        "description": "string",
+        "name": {
+          "type": "string",
+          "minLength": 1
+        },
+        "location": "string"
+      },
+      "results": {}
+    }
+  }
+}
diff --git a/buffet/etc/buffet/gcd.json b/buffet/etc/buffet/gcd.json
index c1462e3..ac05898 100644
--- a/buffet/etc/buffet/gcd.json
+++ b/buffet/etc/buffet/gcd.json
@@ -1,10 +1,5 @@
 {
   "base": {
-    "reboot": {
-      "parameters": {},
-      "results": {}
-    },
-
     "updateBaseConfiguration": {
       "parameters": {
         "localDiscoveryEnabled": "boolean",
@@ -14,9 +9,26 @@
       "results": {}
     },
 
+    "reboot": {
+      "parameters": {},
+      "results": {}
+    },
+
     "identify": {
       "parameters": {},
       "results": {}
+    },
+
+    "updateDeviceInfo": {
+      "parameters": {
+        "description": "string",
+        "name": {
+          "type": "string",
+          "minLength": 1
+        },
+        "location": "string"
+      },
+      "results": {}
     }
   }
 }