diff --git a/openapi.json b/openapi.json
index 1ee42451..8ebbda34 100644
--- a/openapi.json
+++ b/openapi.json
@@ -14,7 +14,7 @@
       "url": "http://www.apache.org/licenses/LICENSE-2.0"
     },
     "version": "2.0.0",
-    "x-box-commit-hash": "d81cf2f982"
+    "x-box-commit-hash": "d6b3a4d2fb"
   },
   "servers": [
     {
@@ -21566,7 +21566,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/Task"
+                  "$ref": "#/components/schemas/TermsOfService"
                 }
               }
             }
@@ -25014,7 +25014,7 @@
             "type": "array",
             "description": "The permissions that this access token permits,\nproviding a list of resources (files, folders, etc)\nand the scopes permitted for each of those resources.",
             "items": {
-              "$ref": "#/components/schemas/FileScope"
+              "$ref": "#/components/schemas/FileOrFolderScope"
             }
           },
           "refresh_token": {
@@ -27109,7 +27109,7 @@
                             "type": "array",
                             "description": "The permissions that this access token permits,\nproviding a list of resources (files, folders, etc)\nand the scopes permitted for each of those resources.",
                             "items": {
-                              "$ref": "#/components/schemas/FileScope"
+                              "$ref": "#/components/schemas/FileOrFolderScope"
                             }
                           }
                         }
@@ -32689,6 +32689,10 @@
         ],
         "x-box-variant": "base",
         "description": "The root-level record that is supposed to represent a\nsingle Terms of Service.",
+        "required": [
+          "id",
+          "type"
+        ],
         "properties": {
           "id": {
             "type": "string",
@@ -36639,14 +36643,14 @@
           }
         ]
       },
-      "FileScope": {
-        "title": "File scope",
+      "FileOrFolderScope": {
+        "title": "File or folder scope",
         "type": "object",
-        "description": "A relation between a file and the scopes for which the file can be accessed",
+        "description": "A relation between a resource (file or folder) and the scopes for which the resource can be accessed",
         "properties": {
           "scope": {
             "type": "string",
-            "description": "The file scopes for the file access",
+            "description": "The scopes for the resource access",
             "example": "item_download",
             "enum": [
               "annotation_edit",
@@ -36666,10 +36670,17 @@
           "object": {
             "allOf": [
               {
-                "$ref": "#/components/schemas/File--Mini"
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/Folder--Mini"
+                  },
+                  {
+                    "$ref": "#/components/schemas/File--Mini"
+                  }
+                ]
               },
               {
-                "description": "The file for which the file can be accessed"
+                "description": "The file or folder resource"
               }
             ]
           }