diff --git a/schemas/2015-07-01/Microsoft.Authorization.json b/schemas/2015-07-01/Microsoft.Authorization.json
new file mode 100644
index 0000000000..a032d9400b
--- /dev/null
+++ b/schemas/2015-07-01/Microsoft.Authorization.json
@@ -0,0 +1,187 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Authorization",
+  "description": "Microsoft Authorization Resource Types",
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
+    "roleAssignments": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-07-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the role assignment to create. It can be any valid GUID."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoleAssignmentProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role assignment properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Authorization/roleAssignments"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Authorization/roleAssignments"
+    },
+    "roleDefinitions": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-07-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The ID of the role definition."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoleDefinitionProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role definition properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Authorization/roleDefinitions"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Authorization/roleDefinitions"
+    }
+  },
+  "definitions": {
+    "Permission": {
+      "type": "object",
+      "properties": {
+        "actions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Allowed actions."
+        },
+        "notActions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Denied actions."
+        }
+      },
+      "description": "Role definition permissions."
+    },
+    "RoleAssignmentProperties": {
+      "type": "object",
+      "properties": {
+        "principalId": {
+          "type": "string",
+          "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group."
+        },
+        "roleDefinitionId": {
+          "type": "string",
+          "description": "The role definition ID used in the role assignment."
+        }
+      },
+      "required": [
+        "principalId",
+        "roleDefinitionId"
+      ],
+      "description": "Role assignment properties."
+    },
+    "RoleDefinitionProperties": {
+      "type": "object",
+      "properties": {
+        "assignableScopes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role definition assignable scopes."
+        },
+        "description": {
+          "type": "string",
+          "description": "The role definition description."
+        },
+        "permissions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Permission"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role definition permissions."
+        },
+        "roleName": {
+          "type": "string",
+          "description": "The role name."
+        },
+        "type": {
+          "type": "string",
+          "description": "The role type."
+        }
+      },
+      "description": "Role definition properties."
+    }
+  }
+}
diff --git a/schemas/2016-07-12-preview/Microsoft.Advisor.json b/schemas/2016-07-12-preview/Microsoft.Advisor.json
index 63026dcf0e..1c789749fc 100644
--- a/schemas/2016-07-12-preview/Microsoft.Advisor.json
+++ b/schemas/2016-07-12-preview/Microsoft.Advisor.json
@@ -3,7 +3,8 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Microsoft.Advisor",
   "description": "Microsoft Advisor Resource Types",
-  "resourceDefinitions": {
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
     "recommendations_suppressions": {
       "type": "object",
       "properties": {
@@ -47,7 +48,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -56,8 +57,8 @@
         "name",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {}
-}
\ No newline at end of file
+}
diff --git a/schemas/2017-03-31/Microsoft.Advisor.json b/schemas/2017-03-31/Microsoft.Advisor.json
index 36b381716f..00a8ce996b 100644
--- a/schemas/2017-03-31/Microsoft.Advisor.json
+++ b/schemas/2017-03-31/Microsoft.Advisor.json
@@ -3,7 +3,8 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Microsoft.Advisor",
   "description": "Microsoft Advisor Resource Types",
-  "resourceDefinitions": {
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
     "recommendations_suppressions": {
       "type": "object",
       "properties": {
@@ -31,7 +32,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -41,7 +42,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {
@@ -60,4 +61,4 @@
       "description": "The properties of the suppression."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2017-04-19/Microsoft.Advisor.json b/schemas/2017-04-19/Microsoft.Advisor.json
index 68ac57d627..4d91cec1af 100644
--- a/schemas/2017-04-19/Microsoft.Advisor.json
+++ b/schemas/2017-04-19/Microsoft.Advisor.json
@@ -48,8 +48,10 @@
         "type"
       ],
       "description": "Microsoft.Advisor/configurations"
-    },
-    "recommendations_suppressions": {
+    }
+  },
+  "subscription_resourceDefinitions": {
+    "configurations": {
       "type": "object",
       "properties": {
         "apiVersion": {
@@ -58,25 +60,31 @@
             "2017-04-19"
           ]
         },
+        "id": {
+          "type": "string",
+          "description": "The resource Id of the configuration resource."
+        },
         "name": {
           "type": "string",
-          "description": "The name of the suppression."
+          "enum": [
+            "configurations"
+          ]
         },
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/SuppressionProperties"
+              "$ref": "#/definitions/ConfigDataProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The properties of the suppression."
+          "description": "The list of property name/value pairs."
         },
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/configurations"
           ]
         }
       },
@@ -86,11 +94,11 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/configurations"
     }
   },
-  "subscription_resourceDefinitions": {
-    "configurations": {
+  "unknown_resourceDefinitions": {
+    "recommendations_suppressions": {
       "type": "object",
       "properties": {
         "apiVersion": {
@@ -99,31 +107,25 @@
             "2017-04-19"
           ]
         },
-        "id": {
-          "type": "string",
-          "description": "The resource Id of the configuration resource."
-        },
         "name": {
           "type": "string",
-          "enum": [
-            "configurations"
-          ]
+          "description": "The name of the suppression."
         },
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ConfigDataProperties"
+              "$ref": "#/definitions/SuppressionProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The list of property name/value pairs."
+          "description": "The properties of the suppression."
         },
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/configurations"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -133,7 +135,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/configurations"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {
@@ -189,4 +191,4 @@
       "description": "The properties of the suppression."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2017-10-01-preview/Microsoft.Authorization.json b/schemas/2017-10-01-preview/Microsoft.Authorization.json
new file mode 100644
index 0000000000..4403356cb0
--- /dev/null
+++ b/schemas/2017-10-01-preview/Microsoft.Authorization.json
@@ -0,0 +1,75 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2017-10-01-preview/Microsoft.Authorization.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Authorization",
+  "description": "Microsoft Authorization Resource Types",
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
+    "roleAssignments": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2017-10-01-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the role assignment to create. It can be any valid GUID."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoleAssignmentProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role assignment properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Authorization/roleAssignments"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Authorization/roleAssignments"
+    }
+  },
+  "definitions": {
+    "RoleAssignmentProperties": {
+      "type": "object",
+      "properties": {
+        "canDelegate": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The delegation flag used for creating a role assignment"
+        },
+        "principalId": {
+          "type": "string",
+          "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group."
+        },
+        "roleDefinitionId": {
+          "type": "string",
+          "description": "The role definition ID used in the role assignment."
+        }
+      },
+      "description": "Role assignment properties."
+    }
+  }
+}
diff --git a/schemas/2018-01-01-preview/Microsoft.Authorization.json b/schemas/2018-01-01-preview/Microsoft.Authorization.json
new file mode 100644
index 0000000000..1891f79c0c
--- /dev/null
+++ b/schemas/2018-01-01-preview/Microsoft.Authorization.json
@@ -0,0 +1,226 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2018-01-01-preview/Microsoft.Authorization.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Authorization",
+  "description": "Microsoft Authorization Resource Types",
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
+    "roleAssignments": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-01-01-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the role assignment to create. It can be any valid GUID."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoleAssignmentProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role assignment properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Authorization/roleAssignments"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Authorization/roleAssignments"
+    },
+    "roleDefinitions": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-01-01-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The ID of the role definition."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoleDefinitionProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role definition properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Authorization/roleDefinitions"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Authorization/roleDefinitions"
+    }
+  },
+  "definitions": {
+    "Permission": {
+      "type": "object",
+      "properties": {
+        "actions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Allowed actions."
+        },
+        "dataActions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Allowed Data actions."
+        },
+        "notActions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Denied actions."
+        },
+        "notDataActions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Denied Data actions."
+        }
+      },
+      "description": "Role definition permissions."
+    },
+    "RoleAssignmentProperties": {
+      "type": "object",
+      "properties": {
+        "canDelegate": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The delegation flag used for creating a role assignment"
+        },
+        "principalId": {
+          "type": "string",
+          "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group."
+        },
+        "roleDefinitionId": {
+          "type": "string",
+          "description": "The role definition ID used in the role assignment."
+        }
+      },
+      "required": [
+        "principalId",
+        "roleDefinitionId"
+      ],
+      "description": "Role assignment properties."
+    },
+    "RoleDefinitionProperties": {
+      "type": "object",
+      "properties": {
+        "assignableScopes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role definition assignable scopes."
+        },
+        "description": {
+          "type": "string",
+          "description": "The role definition description."
+        },
+        "permissions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Permission"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role definition permissions."
+        },
+        "roleName": {
+          "type": "string",
+          "description": "The role name."
+        },
+        "type": {
+          "type": "string",
+          "description": "The role type."
+        }
+      },
+      "description": "Role definition properties."
+    }
+  }
+}
diff --git a/schemas/2018-05-01-preview/Microsoft.Authorization.json b/schemas/2018-05-01-preview/Microsoft.Authorization.json
new file mode 100644
index 0000000000..c7514d9b89
--- /dev/null
+++ b/schemas/2018-05-01-preview/Microsoft.Authorization.json
@@ -0,0 +1,478 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2018-05-01-preview/Microsoft.Authorization.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Authorization",
+  "description": "Microsoft Authorization Resource Types",
+  "resourceDefinitions": {},
+  "subscription_resourceDefinitions": {
+    "accessReviewScheduleDefinitions": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-05-01-preview"
+          ]
+        },
+        "descriptionForAdmins": {
+          "type": "string",
+          "description": "The description provided by the access review creator and visible to admins."
+        },
+        "descriptionForReviewers": {
+          "type": "string",
+          "description": "The description provided by the access review creator to be shown to reviewers."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "The display name for the schedule definition."
+        },
+        "instances": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/AccessReviewInstance"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "This is the collection of instances returned when one does an expand on it."
+        },
+        "name": {
+          "type": "string",
+          "description": "The id of the access review schedule definition."
+        },
+        "reviewers": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/AccessReviewReviewer"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "This is the collection of reviewers."
+        },
+        "settings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccessReviewScheduleSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Settings of an Access Review."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Authorization/accessReviewScheduleDefinitions"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "type"
+      ],
+      "description": "Microsoft.Authorization/accessReviewScheduleDefinitions"
+    },
+    "accessReviewScheduleSettings": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-05-01-preview"
+          ]
+        },
+        "autoApplyDecisionsEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether auto-apply capability, to automatically change the target object access resource, is enabled. If not enabled, a user must, after the review completes, apply the access review."
+        },
+        "defaultDecision": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Approve",
+                "Deny",
+                "Recommendation"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "This specifies the behavior for the autoReview feature when an access review completes."
+        },
+        "defaultDecisionEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether reviewers are required to provide a justification when reviewing access."
+        },
+        "instanceDurationInDays": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The duration in days for an instance."
+        },
+        "justificationRequiredOnApproval": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether the reviewer is required to pass justification when recording a decision."
+        },
+        "mailNotificationsEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether sending mails to reviewers and the review creator is enabled."
+        },
+        "name": {
+          "type": "string",
+          "enum": [
+            "default"
+          ]
+        },
+        "recommendationsEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether showing recommendations to reviewers is enabled."
+        },
+        "recurrence": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccessReviewRecurrenceSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Recurrence Settings of an Access Review Schedule Definition."
+        },
+        "reminderNotificationsEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether sending reminder emails to reviewers are enabled."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Authorization/accessReviewScheduleSettings"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "type"
+      ],
+      "description": "Microsoft.Authorization/accessReviewScheduleSettings"
+    }
+  },
+  "definitions": {
+    "AccessReviewInstance": {
+      "type": "object",
+      "properties": {
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccessReviewInstanceProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Access Review Instance properties."
+        }
+      },
+      "description": "Access Review Instance."
+    },
+    "AccessReviewInstanceProperties": {
+      "type": "object",
+      "properties": {
+        "endDateTime": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The DateTime when the review instance is scheduled to end."
+        },
+        "startDateTime": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The DateTime when the review instance is scheduled to be start."
+        }
+      },
+      "description": "Access Review Instance properties."
+    },
+    "AccessReviewRecurrencePattern": {
+      "type": "object",
+      "properties": {
+        "interval": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The interval for recurrence. For a quarterly review, the interval is 3 for type : absoluteMonthly."
+        },
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "weekly",
+                "absoluteMonthly"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The recurrence type : weekly, monthly, etc."
+        }
+      },
+      "description": "Recurrence Pattern of an Access Review Schedule Definition."
+    },
+    "AccessReviewRecurrenceRange": {
+      "type": "object",
+      "properties": {
+        "endDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The DateTime when the review is scheduled to end. Required if type is endDate"
+        },
+        "numberOfOccurrences": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The number of times to repeat the access review. Required and must be positive if type is numbered."
+        },
+        "startDate": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The DateTime when the review is scheduled to be start. This could be a date in the future. Required on create."
+        },
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "endDate",
+                "noEnd",
+                "numbered"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The recurrence range type. The possible values are: endDate, noEnd, numbered."
+        }
+      },
+      "description": "Recurrence Range of an Access Review Schedule Definition."
+    },
+    "AccessReviewRecurrenceSettings": {
+      "type": "object",
+      "properties": {
+        "pattern": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccessReviewRecurrencePattern"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Recurrence Pattern of an Access Review Schedule Definition."
+        },
+        "range": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccessReviewRecurrenceRange"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Recurrence Range of an Access Review Schedule Definition."
+        }
+      },
+      "description": "Recurrence Settings of an Access Review Schedule Definition."
+    },
+    "AccessReviewReviewer": {
+      "type": "object",
+      "properties": {
+        "principalId": {
+          "type": "string",
+          "description": "The id of the reviewer(user/servicePrincipal)"
+        }
+      },
+      "description": "Descriptor for what needs to be reviewed"
+    },
+    "AccessReviewScheduleSettings": {
+      "type": "object",
+      "properties": {
+        "autoApplyDecisionsEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether auto-apply capability, to automatically change the target object access resource, is enabled. If not enabled, a user must, after the review completes, apply the access review."
+        },
+        "defaultDecision": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Approve",
+                "Deny",
+                "Recommendation"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "This specifies the behavior for the autoReview feature when an access review completes."
+        },
+        "defaultDecisionEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether reviewers are required to provide a justification when reviewing access."
+        },
+        "instanceDurationInDays": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The duration in days for an instance."
+        },
+        "justificationRequiredOnApproval": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether the reviewer is required to pass justification when recording a decision."
+        },
+        "mailNotificationsEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether sending mails to reviewers and the review creator is enabled."
+        },
+        "recommendationsEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether showing recommendations to reviewers is enabled."
+        },
+        "recurrence": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccessReviewRecurrenceSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Recurrence Settings of an Access Review Schedule Definition."
+        },
+        "reminderNotificationsEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether sending reminder emails to reviewers are enabled."
+        }
+      },
+      "description": "Settings of an Access Review."
+    }
+  }
+}
diff --git a/schemas/2018-09-01-preview/Microsoft.Authorization.json b/schemas/2018-09-01-preview/Microsoft.Authorization.json
new file mode 100644
index 0000000000..1c9ddd7682
--- /dev/null
+++ b/schemas/2018-09-01-preview/Microsoft.Authorization.json
@@ -0,0 +1,102 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.Authorization.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Authorization",
+  "description": "Microsoft Authorization Resource Types",
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
+    "roleAssignments": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-09-01-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the role assignment to create. It can be any valid GUID."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoleAssignmentProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role assignment properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Authorization/roleAssignments"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Authorization/roleAssignments"
+    }
+  },
+  "definitions": {
+    "RoleAssignmentProperties": {
+      "type": "object",
+      "properties": {
+        "canDelegate": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The delegation flag used for creating a role assignment"
+        },
+        "principalId": {
+          "type": "string",
+          "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group."
+        },
+        "principalType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "User",
+                "Group",
+                "ServicePrincipal",
+                "Unknown",
+                "DirectoryRoleTemplate",
+                "ForeignGroup",
+                "Application",
+                "MSI",
+                "DirectoryObjectOrGroup",
+                "Everyone"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The principal type of the assigned principal ID."
+        },
+        "roleDefinitionId": {
+          "type": "string",
+          "description": "The role definition ID used in the role assignment."
+        }
+      },
+      "required": [
+        "principalId",
+        "roleDefinitionId"
+      ],
+      "description": "Role assignment properties."
+    }
+  }
+}
diff --git a/schemas/2020-01-01/Microsoft.Advisor.json b/schemas/2020-01-01/Microsoft.Advisor.json
index 043a959b25..ba4d8d2a40 100644
--- a/schemas/2020-01-01/Microsoft.Advisor.json
+++ b/schemas/2020-01-01/Microsoft.Advisor.json
@@ -45,8 +45,10 @@
         "type"
       ],
       "description": "Microsoft.Advisor/configurations"
-    },
-    "recommendations_suppressions": {
+    }
+  },
+  "subscription_resourceDefinitions": {
+    "configurations": {
       "type": "object",
       "properties": {
         "apiVersion": {
@@ -57,23 +59,26 @@
         },
         "name": {
           "type": "string",
-          "description": "The name of the suppression."
+          "enum": [
+            "default"
+          ],
+          "description": "Advisor configuration name. Value must be 'default'"
         },
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/SuppressionProperties"
+              "$ref": "#/definitions/ConfigDataProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The properties of the suppression."
+          "description": "Configuration data properties"
         },
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/suppressions"
+            "Microsoft.Advisor/configurations"
           ]
         }
       },
@@ -83,11 +88,11 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/suppressions"
+      "description": "Microsoft.Advisor/configurations"
     }
   },
-  "subscription_resourceDefinitions": {
-    "configurations": {
+  "unknown_resourceDefinitions": {
+    "recommendations_suppressions": {
       "type": "object",
       "properties": {
         "apiVersion": {
@@ -98,26 +103,23 @@
         },
         "name": {
           "type": "string",
-          "enum": [
-            "default"
-          ],
-          "description": "Advisor configuration name. Value must be 'default'"
+          "description": "The name of the suppression."
         },
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ConfigDataProperties"
+              "$ref": "#/definitions/SuppressionProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Configuration data properties"
+          "description": "The properties of the suppression."
         },
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.Advisor/configurations"
+            "Microsoft.Advisor/recommendations/suppressions"
           ]
         }
       },
@@ -127,7 +129,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.Advisor/configurations"
+      "description": "Microsoft.Advisor/recommendations/suppressions"
     }
   },
   "definitions": {
@@ -259,4 +261,4 @@
       "description": "The properties of the suppression."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2020-04-01-preview/Microsoft.Authorization.json b/schemas/2020-04-01-preview/Microsoft.Authorization.json
new file mode 100644
index 0000000000..82e9c48392
--- /dev/null
+++ b/schemas/2020-04-01-preview/Microsoft.Authorization.json
@@ -0,0 +1,114 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Authorization.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Authorization",
+  "description": "Microsoft Authorization Resource Types",
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
+    "roleAssignments": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-04-01-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the role assignment to create. It can be any valid GUID."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoleAssignmentProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Role assignment properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Authorization/roleAssignments"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Authorization/roleAssignments"
+    }
+  },
+  "definitions": {
+    "RoleAssignmentProperties": {
+      "type": "object",
+      "properties": {
+        "canDelegate": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The delegation flag used for creating a role assignment"
+        },
+        "condition": {
+          "type": "string",
+          "description": "The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase 'foo_storage_container'"
+        },
+        "conditionVersion": {
+          "type": "string",
+          "description": "Version of the condition. Currently accepted value is '2.0'"
+        },
+        "description": {
+          "type": "string",
+          "description": "Description of role assignment"
+        },
+        "principalId": {
+          "type": "string",
+          "description": "The principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group."
+        },
+        "principalType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "User",
+                "Group",
+                "ServicePrincipal",
+                "Unknown",
+                "DirectoryRoleTemplate",
+                "ForeignGroup",
+                "Application",
+                "MSI",
+                "DirectoryObjectOrGroup",
+                "Everyone"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The principal type of the assigned principal ID."
+        },
+        "roleDefinitionId": {
+          "type": "string",
+          "description": "The role definition ID used in the role assignment."
+        }
+      },
+      "required": [
+        "principalId",
+        "roleDefinitionId"
+      ],
+      "description": "Role assignment properties."
+    }
+  }
+}