diff --git a/openapi.yaml b/openapi.yaml
index ab8b71e..8179ac6 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -191,9 +191,7 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/Mapfix"
+                $ref: "#/components/schemas/Mapfixes"
         default:
           description: General Error
           content:
@@ -508,9 +506,7 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/Submission"
+                $ref: "#/components/schemas/Submissions"
         default:
           description: General Error
           content:
@@ -1276,6 +1272,20 @@ components:
         StatusMessage:
           type: string
           maxLength: 256
+    Mapfixes:
+      type: object
+      required:
+      - Total
+      - Mapfixes
+      properties:
+        Total:
+          type: integer
+          format: int64
+          minimum: 0
+        Mapfixes:
+          type: array
+          items:
+            $ref: "#/components/schemas/Mapfix"
     MapfixTriggerCreate:
       required:
       - AssetID
@@ -1396,6 +1406,20 @@ components:
         StatusMessage:
           type: string
           maxLength: 256
+    Submissions:
+      required:
+      - Total
+      - Submissions
+      type: object
+      properties:
+        Total:
+          type: integer
+          format: int64
+          minimum: 0
+        Submissions:
+          type: array
+          items:
+            $ref: "#/components/schemas/Submission"
     SubmissionTriggerCreate:
       required:
       - AssetID