diff --git a/specification/graphrbac/data-plane/1.6/graphrbac.json b/specification/graphrbac/data-plane/1.6/graphrbac.json
index 86962b1d8a0e..5cb476f6013d 100644
--- a/specification/graphrbac/data-plane/1.6/graphrbac.json
+++ b/specification/graphrbac/data-plane/1.6/graphrbac.json
@@ -1850,6 +1850,7 @@
   },
   "definitions": {
     "GraphError": {
+      "type": "object",
       "properties": {
         "odata.error": {
           "type": "object",
@@ -1861,6 +1862,7 @@
       "description": "Active Directory error information."
     },
     "OdataError": {
+      "type": "object",
       "properties": {
         "code": {
           "type": "string",
@@ -1876,6 +1878,7 @@
       "description": "Active Directory OData error information."
     },
     "ErrorMessage": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "string",
@@ -1886,6 +1889,7 @@
       "description": "Active Directory error message."
     },
     "DirectoryObject": {
+      "type": "object",
       "discriminator": "objectType",
       "properties": {
         "objectId": {
@@ -1908,6 +1912,7 @@
       "description": "Represents an Azure Active Directory object."
     },
     "KeyCredential": {
+      "type": "object",
       "properties": {
         "startDate": {
           "type": "string",
@@ -1936,9 +1941,13 @@
           "description": "Type. Acceptable values are 'AsymmetricX509Cert' and 'Symmetric'."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Active Directory Key Credential information."
     },
     "PasswordCredential": {
+      "type": "object",
       "properties": {
         "startDate": {
           "type": "string",
@@ -1959,9 +1968,13 @@
           "description": "Key value."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Active Directory Password Credential information."
     },
     "RequiredResourceAccess": {
+      "type": "object",
       "properties": {
         "resourceAccess": {
           "type": "array",
@@ -1975,12 +1988,16 @@
           "description": "The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "required": [
         "resourceAccess"
       ],
       "description": "Specifies the set of OAuth 2.0 permission scopes and app roles under the specified resource that an application requires access to. The specified OAuth 2.0 permission scopes may be requested by client applications (through the requiredResourceAccess collection) when calling a resource application. The requiredResourceAccess property of the Application entity is a collection of ReqiredResourceAccess."
     },
     "ResourceAccess": {
+      "type": "object",
       "properties": {
         "id": {
           "type": "string",
@@ -1991,12 +2008,16 @@
           "description": "Specifies whether the id property references an OAuth2Permission or an AppRole. Possible values are \"scope\" or \"role\"."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "required": [
         "id"
       ],
       "description": "Specifies an OAuth 2.0 permission scope or an app role that an application requires. The resourceAccess property of the RequiredResourceAccess type is a collection of ResourceAccess."
     },
     "ApplicationCreateParameters": {
+      "type": "object",
       "properties": {
         "availableToOtherTenants": {
           "type": "boolean",
@@ -2055,9 +2076,13 @@
         "displayName",
         "identifierUris"
       ],
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Request parameters for creating a new application."
     },
     "ApplicationUpdateParameters": {
+      "type": "object",
       "properties": {
         "availableToOtherTenants": {
           "type": "boolean",
@@ -2111,9 +2136,13 @@
           "description": "Specifies resources that this application requires access to and the set of OAuth permission scopes and application roles that it needs under each of those resources. This pre-configuration of required resource access drives the consent experience."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Request parameters for updating an existing application."
     },
     "Application": {
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/DirectoryObject"
@@ -2162,9 +2191,13 @@
           "description": "Whether to allow implicit grant flow for OAuth2"
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Active Directory application information."
     },
     "ApplicationListResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2181,6 +2214,7 @@
       "description": "Application list operation result."
     },
     "ApplicationAddOwnerParameters": {
+      "type": "object",
       "properties": {
         "url": {
           "type": "string",
@@ -2190,9 +2224,13 @@
       "required": [
         "url"
       ],
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Request parameters for adding a owner to an application."
     },    
     "KeyCredentialListResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2205,6 +2243,7 @@
       "description": "KeyCredential list operation result."
     },
     "DirectoryObjectListResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2217,6 +2256,7 @@
       "description": "DirectoryObject list operation result."
     },
     "KeyCredentialsUpdateParameters": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2232,6 +2272,7 @@
       "description": "Request parameters for a KeyCredentials update operation"
     },
     "PasswordCredentialListResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2244,6 +2285,7 @@
       "description": "PasswordCredential list operation result."
     },
     "PasswordCredentialsUpdateParameters": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2259,6 +2301,7 @@
       "description": "Request parameters for a PasswordCredentials update operation."
     },
     "AADObject": {
+      "type": "object",
       "properties": {
         "objectId": {
           "type": "string",
@@ -2353,9 +2396,13 @@
           "readOnly": true
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "The properties of an Active Directory object."
     },
     "GetObjectsResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2372,6 +2419,7 @@
       "description": "The response to an Active Directory object inquiry API request."
     },
     "GroupAddMemberParameters": {
+      "type": "object",
       "properties": {
         "url": {
           "type": "string",
@@ -2381,9 +2429,13 @@
       "required": [
         "url"
       ],
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Request parameters for adding a member to a group."
     },
     "GroupCreateParameters": {
+      "type": "object",
       "properties": {
         "displayName": {
           "type": "string",
@@ -2410,9 +2462,13 @@
         "mailNickname",
         "securityEnabled"
       ],
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Request parameters for creating a new group."
     },
     "ADGroup": {
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/DirectoryObject"
@@ -2432,10 +2488,14 @@
           "description": "The primary email address of the group."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "x-ms-discriminator-value": "Group",
       "description": "Active Directory group information."
     },
     "GroupListResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2452,18 +2512,23 @@
       "description": "Server response for Get tenant groups API call"
     },
     "GroupGetMemberGroupsParameters": {
+      "type": "object",
       "properties": {
         "securityEnabledOnly": {
           "type": "boolean",
           "description": "If true, only membership in security-enabled groups should be checked. Otherwise, membership in all groups should be checked."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "required": [
         "securityEnabledOnly"
       ],
       "description": "Request parameters for GetMemberGroups API call."
     },
     "GroupGetMemberGroupsResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2476,6 +2541,7 @@
       "description": "Server response for GetMemberGroups API call."
     },
     "CheckGroupMembershipParameters": {
+      "type": "object",
       "properties": {
         "groupId": {
           "type": "string",
@@ -2486,6 +2552,9 @@
           "description": "The object ID of the contact, group, user, or service principal to check for membership in the specified group."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "required": [
         "groupId",
         "memberId"
@@ -2493,15 +2562,20 @@
       "description": "Request parameters for IsMemberOf API call."
     },
     "CheckGroupMembershipResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "boolean",
           "description": "True if the specified user, group, contact, or service principal has either direct or transitive membership in the specified group; otherwise, false."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Server response for IsMemberOf API call"
     },
     "ServicePrincipalCreateParameters": {
+      "type": "object",
       "properties": {
         "appId": {
           "type": "string",
@@ -2526,6 +2600,9 @@
           "description": "A collection of PasswordCredential objects"
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "required": [
         "appId",
         "accountEnabled"
@@ -2537,7 +2614,8 @@
         {
           "$ref": "#/definitions/DirectoryObject"
         }
-      ],      
+      ],
+      "type": "object",     
       "properties": {
         "displayName": {
           "type": "string",
@@ -2555,9 +2633,13 @@
           "description": "A collection of service principal names."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Active Directory service principal information."
     },
     "ServicePrincipalListResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2574,6 +2656,7 @@
       "description": "Server response for get tenant service principals API call."
     },
     "PasswordProfile": {
+      "type": "object",
       "properties": {
         "password": {
           "type": "string",
@@ -2584,12 +2667,16 @@
           "description": "Whether to force a password change on next login."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "required": [
         "password"
       ],
       "description": "The password profile associated with a user."
     },
     "UserBase": {
+      "type": "object",
       "properties": {
         "immutableId": {
           "type": "string",
@@ -2619,9 +2706,13 @@
             "modelAsString": true
           }
         }
+      },
+      "additionalProperties": {
+        "type": "object"
       }
     },
     "UserCreateParameters": {
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/UserBase"
@@ -2653,6 +2744,9 @@
           "description": "The primary email address of the user."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "required": [
         "accountEnabled",
         "displayName",
@@ -2663,6 +2757,7 @@
       "description": "Request parameters for creating a new work or school account user."
     },
     "UserUpdateParameters": {
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/UserBase"
@@ -2690,9 +2785,13 @@
           "description": "The mail alias for the user."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Request parameters for updating an existing work or school account user."
     },
     "User": {
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/DirectoryObject"
@@ -2755,9 +2854,13 @@
           "description": "The sign-in names of the user."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Active Directory user information."
     },
     "SignInName": {
+      "type": "object",
       "properties": {
         "type": {
           "type": "string",
@@ -2768,21 +2871,29 @@
           "description": "The sign-in used by the local account. Must be unique across the company/tenant. For example, 'johnc@example.com'."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Contains information about a sign-in name of a local account user in an Azure Active Directory B2C tenant."
     },
     "UserGetMemberGroupsParameters": {
+      "type": "object",
       "properties": {
         "securityEnabledOnly": {
           "type": "boolean",
           "description": "If true, only membership in security-enabled groups should be checked. Otherwise, membership in all groups should be checked."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "required": [
         "securityEnabledOnly"
       ],
       "description": "Request parameters for GetMemberGroups API call."
     },
     "UserGetMemberGroupsResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2795,6 +2906,7 @@
       "description": "Server response for GetMemberGroups API call."
     },
     "UserListResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",
@@ -2811,6 +2923,7 @@
       "description": "Server response for Get tenant users API call."
     },
     "GetObjectsParameters": {
+      "type": "object",
       "properties": {
         "objectIds": {
           "type": "array",
@@ -2831,12 +2944,16 @@
           "description": "If true, also searches for object IDs in the partner tenant."
         }
       },
+      "additionalProperties": {
+        "type": "object"
+      },
       "required": [
         "includeDirectoryObjectReferences"
       ],
       "description": "Request parameters for the GetObjectsByObjectIds API."
     },
     "Domain": {
+      "type": "object",
       "properties": {
         "authenticationType": {
           "type": "string",
@@ -2861,9 +2978,13 @@
       "required": [
         "name"
       ],
+      "additionalProperties": {
+        "type": "object"
+      },
       "description": "Active Directory Domain information."
     },
     "DomainListResult": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "array",