diff --git a/buffet/etc/buffet/base_state.defaults.json b/buffet/etc/buffet/base_state.defaults.json
index baeae37..e48afb9 100644
--- a/buffet/etc/buffet/base_state.defaults.json
+++ b/buffet/etc/buffet/base_state.defaults.json
@@ -1,12 +1,8 @@
 {
   "base": {
-    "serialNumber": "",
-    "manufacturer": "",
-    "model": "",
     "firmwareVersion": "",
-    "supportUrl": "",
-    "updateUrl": "",
     "localDiscoveryEnabled": false,
-    "isProximityTokenRequired": false
+    "localAnonymousAccessMaxRole": "none",
+    "localPairingEnabled": true
   }
 }
diff --git a/buffet/etc/buffet/base_state.schema.json b/buffet/etc/buffet/base_state.schema.json
index df74bba..19cc9b2 100644
--- a/buffet/etc/buffet/base_state.schema.json
+++ b/buffet/etc/buffet/base_state.schema.json
@@ -1,12 +1,13 @@
 {
   "base": {
-    "serialNumber": "string",
-    "manufacturer": "string",
-    "model": "string",
     "firmwareVersion": "string",
-    "supportUrl": "string",
-    "updateUrl": "string",
     "localDiscoveryEnabled": "boolean",
-    "isProximityTokenRequired": "boolean"
+    "localAnonymousAccessMaxRole": [ "none", "viewer", "user" ],
+    "localPairingEnabled": "boolean",
+    "network": {
+      "properties": {
+        "name": "string"
+      }
+    }
   }
 }
diff --git a/buffet/etc/buffet/gcd.json b/buffet/etc/buffet/gcd.json
index 1f37cec..c1462e3 100644
--- a/buffet/etc/buffet/gcd.json
+++ b/buffet/etc/buffet/gcd.json
@@ -1,10 +1,22 @@
 {
   "base": {
     "reboot": {
+      "parameters": {},
+      "results": {}
+    },
+
+    "updateBaseConfiguration": {
       "parameters": {
+        "localDiscoveryEnabled": "boolean",
+        "localAnonymousAccessMaxRole": [ "none", "viewer", "user" ],
+        "localPairingEnabled": "boolean"
       },
-      "results": {
-      }
+      "results": {}
+    },
+
+    "identify": {
+      "parameters": {},
+      "results": {}
     }
   }
 }