diff --git a/openapi/components/schemas/_op.yaml b/openapi/components/schemas/_op.yaml
new file mode 100644
index 0000000..000393f
--- /dev/null
+++ b/openapi/components/schemas/_op.yaml
@@ -0,0 +1,4 @@
+type: string
+enum:
+  - "insert"
+  - "patch"
\ No newline at end of file
diff --git a/openapi/components/schemas/_type.yaml b/openapi/components/schemas/_type.yaml
new file mode 100644
index 0000000..7fe03dd
--- /dev/null
+++ b/openapi/components/schemas/_type.yaml
@@ -0,0 +1,5 @@
+description: |
+  Name of the namespace or model
+type: string
+examples:
+  - "datasets/gov/dc/geo/Continent"
\ No newline at end of file
diff --git a/openapi/components/schemas/changes.yaml b/openapi/components/schemas/changes.yaml
index ebd586e..0cc9f52 100644
--- a/openapi/components/schemas/changes.yaml
+++ b/openapi/components/schemas/changes.yaml
@@ -1,9 +1,7 @@
 type: object
 properties:
   _type:
-    type: string
-    examples:
-      - datasets/gov/dc/geo/Continent
+    $ref: ./_type.yaml
   _data:
     type: array
     items:
diff --git a/openapi/components/schemas/multiInsert.yaml b/openapi/components/schemas/multiInsert.yaml
index c6f88e8..d3ab1c5 100644
--- a/openapi/components/schemas/multiInsert.yaml
+++ b/openapi/components/schemas/multiInsert.yaml
@@ -4,13 +4,6 @@ properties:
     type: array
     items:
       anyOf:
-        - _op:
-          type: string
-          enum:
-            - insert
-            - patch
-        - _type:
-          type: string
-          examples:
-            - datasets/gov/dc/geo/Continent
-        - $ref: insert.yaml
+        - $ref: ./_op.yaml
+        - $ref: ./_type.yaml
+        - $ref: ./insert.yaml
diff --git a/openapi/components/schemas/object.yaml b/openapi/components/schemas/object.yaml
index 793e911..3918015 100644
--- a/openapi/components/schemas/object.yaml
+++ b/openapi/components/schemas/object.yaml
@@ -1,11 +1,7 @@
 type: object
 properties:
   _type:
-    description: |
-      Name of the namespace or model
-    type: string
-    examples:
-      - datasets/gov/dc/geo/Continent
+    $ref: ./_type.yaml
   _id:
     description: |
       Unique object ID in UUID format
diff --git a/openapi/paths/changes.yaml b/openapi/paths/changes.yaml
index 9ee59bb..2df424b 100644
--- a/openapi/paths/changes.yaml
+++ b/openapi/paths/changes.yaml
@@ -3,6 +3,7 @@ parameters:
   - $ref: ../components/parameters/form.yaml
   - $ref: ../components/parameters/org.yaml
   - $ref: ../components/parameters/dataset.yaml
+  - $ref: ../components/parameters/version.yaml
   - $ref: ../components/parameters/model.yaml
   - $ref: ../components/parameters/cid.yaml
   - $ref: ../components/parameters/traceparent.yaml
diff --git a/openapi/paths/file.yaml b/openapi/paths/file.yaml
index b982f15..a2f5ce7 100644
--- a/openapi/paths/file.yaml
+++ b/openapi/paths/file.yaml
@@ -1,4 +1,5 @@
 parameters:
+  - $ref: ../components/parameters/group.yaml
   - $ref: ../components/parameters/form.yaml
   - $ref: ../components/parameters/org.yaml
   - $ref: ../components/parameters/dataset.yaml
diff --git a/openapi/paths/model.yaml b/openapi/paths/model.yaml
index 55aa386..2e73f19 100644
--- a/openapi/paths/model.yaml
+++ b/openapi/paths/model.yaml
@@ -23,6 +23,8 @@ head:
   responses:
     '200':
       description: OK
+    '400':
+      $ref: ../components/responses/error400.yaml
 
 get:
   tags:
diff --git a/openapi/paths/object.yaml b/openapi/paths/object.yaml
index b594672..867a5c8 100644
--- a/openapi/paths/object.yaml
+++ b/openapi/paths/object.yaml
@@ -1,4 +1,5 @@
 parameters:
+  - $ref: ../components/parameters/group.yaml
   - $ref: ../components/parameters/form.yaml
   - $ref: ../components/parameters/org.yaml
   - $ref: ../components/parameters/dataset.yaml
@@ -22,6 +23,8 @@ head:
   responses:
     '200':
       description: OK
+    '400':
+      $ref: ../components/responses/error400.yaml
 
 get:
   tags:
diff --git a/openapi/paths/service.yaml b/openapi/paths/service.yaml
index 3be8f1a..e4c4de9 100644
--- a/openapi/paths/service.yaml
+++ b/openapi/paths/service.yaml
@@ -43,6 +43,7 @@ options:
   security:
     - {}
   summary: OPTIONS operation
+  operationId: serviceOptions
 head:
   tags:
     - services
diff --git a/openapi/paths/wipe.yaml b/openapi/paths/wipe.yaml
index 6573c24..9813603 100644
--- a/openapi/paths/wipe.yaml
+++ b/openapi/paths/wipe.yaml
@@ -1,7 +1,9 @@
 parameters:
+  - $ref: ../components/parameters/group.yaml
   - $ref: ../components/parameters/form.yaml
   - $ref: ../components/parameters/org.yaml
   - $ref: ../components/parameters/dataset.yaml
+  - $ref: ../components/parameters/version.yaml
   - $ref: ../components/parameters/model.yaml
   - $ref: ../components/parameters/id.yaml
   - $ref: ../components/parameters/traceparent.yaml