diff --git a/schemas/2014-02-26/microsoft.visualstudio.json b/schemas/2014-02-26/microsoft.visualstudio.json
deleted file mode 100644
index eaa57048e5..0000000000
--- a/schemas/2014-02-26/microsoft.visualstudio.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2014-02-26/microsoft.visualstudio.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "microsoft.visualstudio",
-  "description": "Visual Studio Online Account and Project Resource",
-  "resourceDefinitions": {
-    "account": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": [
-            "microsoft.visualstudio/account"
-          ]
-        },
-        "apiVersion": {
-          "enum": [
-            "2014-02-26"
-          ]
-        },
-        "properties": {
-          "type": "object",
-          "properties": {
-            "OperationType": {
-              "type": "string",
-              "minLength": 1,
-              "description": "microsoft.visualstudio/account: Type of operation being performed on the account, which can be either Create or Link."
-            },
-            "AccountName": {
-              "type": "string",
-              "minLength": 1,
-              "description": "microsoft.visualstudio/account: Name of the Visual Studio Online account"
-            }
-          }
-        },
-        "resources": {
-          "type": "array",
-          "items": {
-            "allOf": [
-              {
-                "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/resourceBase"
-              },
-              {
-                "$ref": "#/resourceDefinitions/project"
-              }
-            ]
-          },
-          "description": "microsoft.visualstudio/account: Visual Studio Online Account."
-        }
-      },
-      "required": [
-        "type",
-        "apiVersion",
-        "properties",
-        "location"
-      ],
-      "description": "microsoft.visualstudio account"
-    },
-    "project": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": [
-            "microsoft.visualstudio/account/project",
-            "project"
-          ]
-        },
-        "apiVersion": {
-          "enum": [
-            "2014-02-26"
-          ]
-        },
-        "properties": {
-          "type": "object",
-          "properties": {
-            "ProcessTemplateId": {
-              "type": "string",
-              "minLength": 1,
-              "description": "microsoft.visualstudio/account/project: Process template guid for the project"
-            },
-            "VersionControlOption": {
-              "type": "string",
-              "minLength": 1,
-              "description": "microsoft.visualstudio/account/project: Version control type for the project, currently TfsVc and Git"
-            }
-          }
-        }
-      },
-      "required": [
-        "type",
-        "apiVersion",
-        "properties"
-      ],
-      "description": "microsoft.visualstudio account/project: Visual Studio Online TFS Project"
-    }
-  }    
-}
\ No newline at end of file
diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json
index 2cdf17a50e..6dae7b865d 100644
--- a/schemas/2014-04-01-preview/deploymentTemplate.json
+++ b/schemas/2014-04-01-preview/deploymentTemplate.json
@@ -160,13 +160,8 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/webtests" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2014-02-26/microsoft.visualstudio.json#/resourceDefinitions/account" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.Cache.json#/resourceDefinitions/Redis" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-08-01-preview/Microsoft.Scheduler.json#/resourceDefinitions/jobCollections" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/notificationHubs" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_notificationhubs_authorizationRules" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_authorizationRules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_notificationHubs" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_notificationHubs_AuthorizationRules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces" },
@@ -209,6 +204,12 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_fileServices_shares" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_managementPolicies" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_privateEndpointConnections" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_encryptionScopes" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_objectReplicationPolicies" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_queueServices" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_queueServices_queues" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_tableServices" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_tableServices_tables" },				  
                   { "$ref": "https://schema.management.azure.com/schemas/2019-04-01/Microsoft.VMwareCloudSimple.json#/resourceDefinitions/dedicatedCloudNodes" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-04-01/Microsoft.VMwareCloudSimple.json#/resourceDefinitions/dedicatedCloudServices" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-04-01/Microsoft.VMwareCloudSimple.json#/resourceDefinitions/virtualMachines" },
diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json
index a3b731fa41..8a18d0e65a 100644
--- a/schemas/2015-01-01/deploymentTemplate.json
+++ b/schemas/2015-01-01/deploymentTemplate.json
@@ -206,11 +206,7 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/webtests" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2014-02-26/microsoft.visualstudio.json#/resourceDefinitions/account" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2014-02-26/microsoft.visualstudio.json#/resourceDefinitions/project" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.Cache.json#/resourceDefinitions/Redis" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/notificationHubs" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_notificationhubs_authorizationRules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_notificationHubs" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_notificationHubs_AuthorizationRules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.Cache.json#/resourceDefinitions/Redis" },
@@ -251,6 +247,12 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_fileServices_shares" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_managementPolicies" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_privateEndpointConnections" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_encryptionScopes" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_objectReplicationPolicies" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_queueServices" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_queueServices_queues" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_tableServices" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_tableServices_tables" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-04-01/Microsoft.VMwareCloudSimple.json#/resourceDefinitions/dedicatedCloudNodes" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-04-01/Microsoft.VMwareCloudSimple.json#/resourceDefinitions/dedicatedCloudServices" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-04-01/Microsoft.VMwareCloudSimple.json#/resourceDefinitions/virtualMachines" },
@@ -263,8 +265,6 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2014-06-01/Microsoft.Web.json#/resourceDefinitions/sites" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.Web.json#/resourceDefinitions/sites" },
                   { "$ref": "https://schema.management.azure.com/schemas/2014-08-01-preview/Microsoft.Scheduler.json#/resourceDefinitions/jobCollections" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_authorizationRules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachines" },
                   { "$ref": "https://schema.management.azure.com/schemas/2015-10-01-preview/Microsoft.DataLakeStore.json#/resourceDefinitions/accounts" },
                   { "$ref": "https://schema.management.azure.com/schemas/2016-11-01/Microsoft.DataLakeStore.json#/resourceDefinitions/accounts" },
@@ -890,6 +890,7 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_firewallRules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_virtualNetworkRules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_securityAlertPolicies" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_Administrators" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_configurations" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_databases" },
diff --git a/schemas/2015-04-01/Microsoft.NotificationHubs.json b/schemas/2015-04-01/Microsoft.NotificationHubs.json
deleted file mode 100644
index 439b42690d..0000000000
--- a/schemas/2015-04-01/Microsoft.NotificationHubs.json
+++ /dev/null
@@ -1,404 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.NotificationHubs",
-  "description": "Microsoft Notification Hubs",
-  "resourceDefinitions": {
-    "namespaces": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": [
-            "Microsoft.NotificationHubs/namespaces"
-          ]
-        },
-        "apiVersion": {
-          "enum": [
-            "2015-04-01"
-          ]
-        },
-        "properties": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string",
-              "minLength": 1,
-              "description": "Microsoft.NotificationHubs/namespaces: The name of the namespace."
-            },
-            "namespaceType": {
-              "oneOf": [
-                {
-                  "enum": [
-                    "NotificationHub"
-                  ]
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                }
-              ],
-              "description": "Microsoft.NotificationHubs/namespaces: The type of the namespace"
-            }
-          },
-          "required": [
-            "namespaceType"
-          ]
-        },
-        "resources": {
-          "type": "array",
-          "items": {
-            "allOf": [
-              {
-                "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/resourceBase"
-              },
-              {
-                "$ref": "#/resourceDefinitions/notificationHubs"
-              }
-            ]
-          },
-          "description": "Microsoft.NotificationHubs/namespaces: Collection of NotificationHubs resources."
-        }
-      },
-      "required": [
-        "type",
-        "apiVersion",
-        "properties"
-      ],
-      "description": "Microsoft.NotificationHubs/namespaces resource"
-    },
-    "namespaces_authorizationRules": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "minLength": 1,
-          "maxLength": 50,
-          "description": "The authorization rule name."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.NotificationHubs/namespaces/AuthorizationRules"
-          ]
-        },
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2015-04-01"
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SBAuthorizationRuleProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "AuthorizationRule properties."
-        }
-      },
-      "required": [
-        "name",
-        "type",
-        "apiVersion",
-        "properties"
-      ],
-      "description": "Microsoft.NotificationHubs/namespaces/AuthorizationRules"
-    },
-    "notificationHubs": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "enum": [
-            "Microsoft.NotificationHubs/namespaces/notificationHubs"
-          ]
-        },
-        "apiVersion": {
-          "enum": [
-            "2015-04-01"
-          ]
-        },
-        "properties": {
-          "type": "object",
-          "properties": {
-            "wnsCredential": {
-              "oneOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "packageSid": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: The Package SID provided by Windows Live Application Management when registering the application."
-                    },
-                    "secretKey": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: The Secret Key associated with the packageSid provided by Windows Live Application Management when registering the application."
-                    },
-                    "windowsLiveEndpoint": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: The Windows Live Endpoint used to retrieve the Access Token for the application"
-                    }
-                  }
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                }
-              ],
-              "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: WNS credentials for a Notification Hub."
-            },
-            "apnsCredential": {
-              "oneOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "apnsCertificate": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: A certificate (in base 64 format) provided by Apple on the iOS Provisioning Portal"
-                    },
-                    "certificateKey": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: The Certificate Key provided by the iOS Provisioning Portal when registering the application"
-                    },
-                    "endpoint": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: The APNS endpoint to which our service connects. This is one of two values: gateway.sandbox.push.apple.com for the sandbox endpoint or gateway.push.apple.com, for the production endpoint. Any other value is invalid."
-                    }
-                  }
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                }
-              ],
-              "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: APNS credentials for a Notification Hub."
-            },
-            "gcmCredential": {
-              "oneOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "googleApiKey": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: Google API key for authenticating with GCM"
-                    },
-                    "gcmEndpoint": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: The GCM endpoint to which our connects. Valid endpoint: https://android.googleapis.com/gcm/send . Other values are invalid."
-                    }
-                  }
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                }
-              ],
-              "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: GCM credentials for a Notification Hub."
-            },
-            "mpnsCredential": {
-              "oneOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "mpnsCertificate": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: A certificate (in base 64 format) uploaded to the Windows Phone portal"
-                    },
-                    "certificateKey": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: The Certificate Key provided by the Windows Phone Portal when registering the application"
-                    }
-                  }
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                }
-              ],
-              "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: MPNS credentials for a Notification Hub."
-            },
-            "AdmCredential": {
-              "oneOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "clientId": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: ClientId for authenticating with ADM"
-                    },
-                    "clientSecret": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: ClientSecret for authenticating with ADM"
-                    },
-                    "authTokenUrl": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: The AuthToken URL. valid endpoint: https://api.amazon.com/auth/O2/token . Other values are invalid."
-                    }
-                  }
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                }
-              ],
-              "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: ADM credentials for a Notification Hub."
-            },
-            "BaiduCredential": {
-              "oneOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "baiduApiKey": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: ApiKey provided by the Baidu portal"
-                    },
-                    "baiduSecretKey": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: SecretKey provided by the Baidu portal"
-                    },
-                    "baiduEndPoint": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: The Baidu endpoint to which our service connects"
-                    }
-                  }
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                }
-              ],
-              "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: Baidu credentials for a Notification Hub."
-            },
-            "authorizationRules": {
-              "oneOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "keyName": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: Authorization Rule Name"
-                    },
-                    "primaryKey": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: Authorization Rule Primary Key Value"
-                    },
-                    "secondaryKey": {
-                      "type": "string",
-                      "minLength": 1,
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs:  Authorization Rule Secondary Key Value"
-                    },
-                    "rights": {
-                      "enum": [
-                        "Send",
-                        "Manage",
-                        "Listen"
-                      ],
-                      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: Authorization Rule Rights"
-                    }
-                  }
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-                }
-              ],
-              "description": "Microsoft.NotificationHubs/namespaces/notificationHubs: Authorization Rules for a Notification Hub."
-            }
-          }
-        }
-      },
-      "required": [
-        "type",
-        "apiVersion",
-        "properties"
-      ],
-      "description": "Microsoft.NotificationHubs/namespaces/notificationHubs resource"
-    },
-    "namespaces_notificationhubs_authorizationRules": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "minLength": 1,
-          "maxLength": 50,
-          "description": "The authorizationrule name."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.NotificationHubs/namespaces/NotificationHubs/authorizationRules"
-          ]
-        },
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2015-04-01"
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SBAuthorizationRuleProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "AuthorizationRule properties."
-        }
-      },
-      "required": [
-        "name",
-        "type",
-        "apiVersion",
-        "properties"
-      ],
-      "description": "Microsoft.NotificationHubs/namespaces/queues/authorizationRules"
-    }
-  },
-  "definitions": {
-    "SBAuthorizationRuleProperties": {
-      "type": "object",
-      "properties": {
-        "rights": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "type": "string",
-                "enum": [
-                  "Manage",
-                  "Send",
-                  "Listen"
-                ]
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The rights associated with the rule."
-        }
-      },
-      "required": [
-        "rights"
-      ],
-      "description": "AuthorizationRule properties."
-    },
-    "SBNamespaceProperties": {
-      "description": "Properties of the namespace."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2017-04-01/Microsoft.EventHub.json b/schemas/2017-04-01/Microsoft.EventHub.json
index 6e56feb09f..616f751ec0 100644
--- a/schemas/2017-04-01/Microsoft.EventHub.json
+++ b/schemas/2017-04-01/Microsoft.EventHub.json
@@ -187,7 +187,7 @@
         "name": {
           "type": "string",
           "minLength": 1,
-          "maxLength": 50,
+          "maxLength": 256,
           "description": "The Event Hub name"
         },
         "properties": {
@@ -766,7 +766,7 @@
         "name": {
           "type": "string",
           "minLength": 1,
-          "maxLength": 50,
+          "maxLength": 256,
           "description": "The Event Hub name"
         },
         "properties": {
diff --git a/schemas/2018-01-01-preview/Microsoft.EventHub.json b/schemas/2018-01-01-preview/Microsoft.EventHub.json
index 9384bb4546..f8d243e0c1 100644
--- a/schemas/2018-01-01-preview/Microsoft.EventHub.json
+++ b/schemas/2018-01-01-preview/Microsoft.EventHub.json
@@ -671,6 +671,17 @@
           ],
           "description": "List of IpRules"
         },
+        "trustedServiceAccessEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Value that indicates whether Trusted Service Access is Enabled or not."
+        },
         "virtualNetworkRules": {
           "oneOf": [
             {
diff --git a/schemas/2018-01-01-preview/Microsoft.ServiceBus.json b/schemas/2018-01-01-preview/Microsoft.ServiceBus.json
index 1ddcda960b..c2dda9fba9 100644
--- a/schemas/2018-01-01-preview/Microsoft.ServiceBus.json
+++ b/schemas/2018-01-01-preview/Microsoft.ServiceBus.json
@@ -251,34 +251,6 @@
       },
       "description": "Properties to configure Encryption"
     },
-    "Identity": {
-      "type": "object",
-      "properties": {
-        "principalId": {
-          "type": "string",
-          "description": "ObjectId from the KeyVault"
-        },
-        "tenantId": {
-          "type": "string",
-          "description": "TenantId from the KeyVault"
-        },
-        "type": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "SystemAssigned"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Enumerates the possible value Identity type, which currently supports only 'SystemAssigned'."
-        }
-      },
-      "description": "Properties to configure Identity for Bring your Own Keys"
-    },
     "IpFilterRuleProperties": {
       "type": "object",
       "properties": {
@@ -558,17 +530,6 @@
           ],
           "description": "Properties to configure Encryption"
         },
-        "identity": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Identity"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties to configure Identity for Bring your Own Keys"
-        },
         "zoneRedundant": {
           "oneOf": [
             {
diff --git a/schemas/2018-06-01-preview/Microsoft.HDInsight.json b/schemas/2018-06-01-preview/Microsoft.HDInsight.json
index f523da7dfa..29b99e3597 100644
--- a/schemas/2018-06-01-preview/Microsoft.HDInsight.json
+++ b/schemas/2018-06-01-preview/Microsoft.HDInsight.json
@@ -897,6 +897,18 @@
           ],
           "description": "Algorithm identifier for encryption, default RSA-OAEP."
         },
+        "encryptionAtHost": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates whether or not resource disk encryption is enabled."
+        },
         "keyName": {
           "type": "string",
           "description": "Key name that is used for enabling disk encryption."
diff --git a/schemas/2018-06-01-privatepreview/Microsoft.DBforPostgreSQL.json b/schemas/2018-06-01-privatepreview/Microsoft.DBforPostgreSQL.json
deleted file mode 100644
index 4230c7059b..0000000000
--- a/schemas/2018-06-01-privatepreview/Microsoft.DBforPostgreSQL.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2018-06-01-privatepreview/Microsoft.DBforPostgreSQL.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.DBforPostgreSQL",
-  "description": "Microsoft DBforPostgreSQL Resource Types",
-  "resourceDefinitions": {
-    "servers_privateEndpointConnections": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2018-06-01-privatepreview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the private endpoint connection."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PrivateEndpointConnectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of a private endpoint connection."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforPostgreSQL/servers/privateEndpointConnections"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/servers/privateEndpointConnections"
-    }
-  },
-  "definitions": {
-    "PrivateEndpointConnectionProperties": {
-      "type": "object",
-      "properties": {
-        "privateEndpoint": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PrivateEndpointProperty"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "privateLinkServiceConnectionState": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PrivateLinkServiceConnectionStateProperty"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        }
-      },
-      "description": "Properties of a private endpoint connection."
-    },
-    "PrivateEndpointProperty": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "Resource id of the private endpoint."
-        }
-      }
-    },
-    "PrivateLinkServiceConnectionStateProperty": {
-      "type": "object",
-      "properties": {
-        "description": {
-          "type": "string",
-          "description": "The private link service connection description."
-        },
-        "status": {
-          "type": "string",
-          "description": "The private link service connection status."
-        }
-      },
-      "required": [
-        "description",
-        "status"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json
index 63710a4254..a3a3b5f5f7 100644
--- a/schemas/2018-06-01/Microsoft.DataFactory.json
+++ b/schemas/2018-06-01/Microsoft.DataFactory.json
@@ -74,6 +74,9 @@
               },
               {
                 "$ref": "#/definitions/factories_dataflows_childResource"
+              },
+              {
+                "$ref": "#/definitions/factories_managedVirtualNetworks_childResource"
               }
             ]
           }
@@ -304,6 +307,114 @@
       ],
       "description": "Microsoft.DataFactory/factories/linkedservices"
     },
+    "factories_managedVirtualNetworks": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-06-01"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$",
+              "minLength": 1,
+              "maxLength": 127
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Managed virtual network name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedVirtualNetwork"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A managed Virtual Network associated with the Azure Data Factory"
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/factories_managedVirtualNetworks_managedPrivateEndpoints_childResource"
+              }
+            ]
+          }
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.DataFactory/factories/managedVirtualNetworks"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.DataFactory/factories/managedVirtualNetworks"
+    },
+    "factories_managedVirtualNetworks_managedPrivateEndpoints": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-06-01"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$",
+              "minLength": 1,
+              "maxLength": 127
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Managed private endpoint name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedPrivateEndpoint"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties of a managed private endpoint"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints"
+    },
     "factories_pipelines": {
       "type": "object",
       "properties": {
@@ -4086,6 +4197,11 @@
       ],
       "description": "Concur Service dataset."
     },
+    "ConnectionStateProperties": {
+      "type": "object",
+      "properties": {},
+      "description": "The connection state of a managed private endpoint"
+    },
     "ControlActivity": {
       "type": "object",
       "oneOf": [
@@ -5202,17 +5318,6 @@
             }
           ],
           "description": "Linked service reference type."
-        },
-        "staging": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/DataFlowStagingInfo"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Staging info for execute data flow activity."
         }
       },
       "required": [
@@ -5263,17 +5368,6 @@
             }
           ],
           "description": "Linked service reference type."
-        },
-        "staging": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/DataFlowStagingInfo"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Staging info for execute data flow activity."
         }
       },
       "required": [
@@ -7819,6 +7913,104 @@
       ],
       "description": "Microsoft.DataFactory/factories/linkedservices"
     },
+    "factories_managedVirtualNetworks_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-06-01"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$",
+              "minLength": 1,
+              "maxLength": 127
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Managed virtual network name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedVirtualNetwork"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A managed Virtual Network associated with the Azure Data Factory"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "managedVirtualNetworks"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.DataFactory/factories/managedVirtualNetworks"
+    },
+    "factories_managedVirtualNetworks_managedPrivateEndpoints_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-06-01"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$",
+              "minLength": 1,
+              "maxLength": 127
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Managed private endpoint name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedPrivateEndpoint"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties of a managed private endpoint"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "managedPrivateEndpoints"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints"
+    },
     "factories_pipelines_childResource": {
       "type": "object",
       "properties": {
@@ -12476,6 +12668,83 @@
       },
       "description": "Managed integration runtime type properties."
     },
+    "ManagedPrivateEndpoint": {
+      "type": "object",
+      "properties": {
+        "additionalProperties": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "object",
+                "properties": {}
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Unmatched properties from the message are deserialized this collection"
+        },
+        "connectionState": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ConnectionStateProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The connection state of a managed private endpoint"
+        },
+        "fqdns": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Fully qualified domain names"
+        },
+        "groupId": {
+          "type": "string",
+          "description": "The groupId to which the managed private endpoint is created"
+        },
+        "privateLinkResourceId": {
+          "type": "string",
+          "description": "The ARM resource ID of the resource to which the managed private endpoint is created"
+        }
+      },
+      "description": "Properties of a managed private endpoint"
+    },
+    "ManagedVirtualNetwork": {
+      "type": "object",
+      "properties": {
+        "additionalProperties": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "object",
+                "properties": {}
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Unmatched properties from the message are deserialized this collection"
+        }
+      },
+      "description": "A managed Virtual Network associated with the Azure Data Factory"
+    },
     "MappingDataFlow": {
       "type": "object",
       "properties": {
diff --git a/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json b/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json
index b4bec4a288..fa52320d70 100644
--- a/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json
+++ b/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json
@@ -537,6 +537,12 @@
       "oneOf": [
         {
           "$ref": "#/definitions/EyesOn"
+        },
+        {
+          "$ref": "#/definitions/EntityAnalytics"
+        },
+        {
+          "$ref": "#/definitions/Ueba"
         }
       ],
       "properties": {
@@ -552,7 +558,7 @@
         },
         "name": {
           "type": "string",
-          "description": "The setting name. Supports- EyesOn"
+          "description": "The setting name. Supports - EyesOn, EntityAnalytics, Ueba"
         },
         "type": {
           "type": "string",
@@ -567,6 +573,49 @@
         "type"
       ],
       "description": "Microsoft.SecurityInsights/settings"
+    },
+    "watchlists": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-01-01-preview"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Etag of the azure resource"
+        },
+        "name": {
+          "type": "string",
+          "description": "Watchlist Alias"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WatchlistProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Describes watchlist properties"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.SecurityInsights/watchlists"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.SecurityInsights/watchlists"
     }
   },
   "definitions": {
@@ -1224,6 +1273,37 @@
       ],
       "description": "Microsoft.SecurityInsights/cases/relations"
     },
+    "EntityAnalytics": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string",
+          "enum": [
+            "EntityAnalytics"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EntityAnalyticsProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "EntityAnalytics property bag."
+        }
+      },
+      "required": [
+        "kind"
+      ],
+      "description": "Settings with single toggle."
+    },
+    "EntityAnalyticsProperties": {
+      "type": "object",
+      "properties": {},
+      "description": "EntityAnalytics property bag."
+    },
     "EyesOn": {
       "type": "object",
       "properties": {
@@ -2305,7 +2385,8 @@
                   "Collection",
                   "Exfiltration",
                   "CommandAndControl",
-                  "Impact"
+                  "Impact",
+                  "PreAttack"
                 ]
               }
             },
@@ -2546,6 +2627,58 @@
       },
       "description": "Threat Intelligence taxii client data connector properties."
     },
+    "Ueba": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string",
+          "enum": [
+            "Ueba"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UebaProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Ueba property bag."
+        }
+      },
+      "required": [
+        "kind"
+      ],
+      "description": "Settings with single toggle."
+    },
+    "UebaProperties": {
+      "type": "object",
+      "properties": {
+        "dataSources": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "AuditLogs",
+                  "AzureActivity",
+                  "SecurityEvent",
+                  "SigninLogs"
+                ]
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The relevant data sources that enriched by ueba"
+        }
+      },
+      "description": "Ueba property bag."
+    },
     "UserInfo": {
       "type": "object",
       "properties": {
@@ -2563,6 +2696,215 @@
         }
       },
       "description": "User information that made some action"
+    },
+    "WatchlistItem": {
+      "type": "object",
+      "properties": {
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WatchlistItemProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Describes watchlist item properties"
+        }
+      },
+      "description": "Represents a Watchlist Item in Azure Security Insights."
+    },
+    "WatchlistItemProperties": {
+      "type": "object",
+      "properties": {
+        "createdBy": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UserInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "User information that made some action"
+        },
+        "createdTimeUtc": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The time the watchlist item was created"
+        },
+        "entityMapping": {
+          "type": "object",
+          "properties": {},
+          "description": "A key-value pair for a watchlist item entity mapping"
+        },
+        "lastUpdatedTimeUtc": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The last time the watchlist item was updated"
+        },
+        "tenantId": {
+          "type": "string",
+          "description": "The tenantId to which this watchlist item belongs to"
+        },
+        "timeToLiveUtc": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The time to live for the watchlist item"
+        },
+        "updatedBy": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UserInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "User information that made some action"
+        },
+        "watchlistId": {
+          "type": "string",
+          "description": "The watchlist id of the parent of this watchlist item"
+        },
+        "watchlistItemName": {
+          "type": "string",
+          "description": "Name of the watchlist item"
+        },
+        "watchlistItemPair": {
+          "type": "object",
+          "properties": {},
+          "description": "A key-value pair for a watchlist item"
+        },
+        "watchlistItemType": {
+          "type": "string",
+          "description": "The type of the watchlist item"
+        }
+      },
+      "required": [
+        "watchlistId",
+        "watchlistItemPair"
+      ],
+      "description": "Describes watchlist item properties"
+    },
+    "WatchlistProperties": {
+      "type": "object",
+      "properties": {
+        "createdBy": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UserInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "User information that made some action"
+        },
+        "createdTimeUtc": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The time the watchlist was created"
+        },
+        "defaultDuration": {
+          "type": "string",
+          "format": "duration",
+          "description": "The default duration of a watchlist (in ISO 8601 duration format)"
+        },
+        "description": {
+          "type": "string",
+          "description": "A description of the watchlist"
+        },
+        "displayName": {
+          "type": "string",
+          "description": "The display name of the watchlist"
+        },
+        "labels": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "List of labels relevant to this watchlist"
+        },
+        "lastUpdatedTimeUtc": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The last time the watchlist was updated"
+        },
+        "notes": {
+          "type": "string",
+          "description": "The notes of the watchlist"
+        },
+        "provider": {
+          "type": "string",
+          "description": "The provider of the watchlist"
+        },
+        "source": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Local file",
+                "Remote storage"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The source of the watchlist."
+        },
+        "tenantId": {
+          "type": "string",
+          "description": "The tenantId where the watchlist belongs to."
+        },
+        "updatedBy": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UserInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "User information that made some action"
+        },
+        "watchlistItems": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/WatchlistItem"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "List of watchlist items."
+        },
+        "watchlistType": {
+          "type": "string",
+          "description": "The type of the watchlist"
+        },
+        "workspaceId": {
+          "type": "string",
+          "description": "The workspaceId where the watchlist belongs to."
+        }
+      },
+      "required": [
+        "displayName",
+        "provider",
+        "source"
+      ],
+      "description": "Describes watchlist properties"
     }
   }
 }
\ No newline at end of file
diff --git a/schemas/2019-02-01/Microsoft.ContainerService.json b/schemas/2019-02-01/Microsoft.ContainerService.json
index 96c6ebb11c..3a46b4ce46 100644
--- a/schemas/2019-02-01/Microsoft.ContainerService.json
+++ b/schemas/2019-02-01/Microsoft.ContainerService.json
@@ -1055,7 +1055,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2019-03-01-hybrid/deploymentTemplate.json b/schemas/2019-03-01-hybrid/deploymentTemplate.json
index 1fd6d35639..6687e84da3 100644
--- a/schemas/2019-03-01-hybrid/deploymentTemplate.json
+++ b/schemas/2019-03-01-hybrid/deploymentTemplate.json
@@ -569,18 +569,9 @@
             {
               "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/webtests"
             },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/2014-02-26/microsoft.visualstudio.json#/resourceDefinitions/account"
-            },
             {
               "$ref": "https://schema.management.azure.com/schemas/2014-04-01-preview/Microsoft.Cache.json#/resourceDefinitions/Redis"
             },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/notificationHubs"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_notificationhubs_authorizationRules"
-            },
             {
               "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_notificationHubs"
             },
@@ -710,12 +701,6 @@
             {
               "$ref": "https://schema.management.azure.com/schemas/2014-08-01-preview/Microsoft.Scheduler.json#/resourceDefinitions/jobCollections"
             },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces_authorizationRules"
-            },
             {
               "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.NotificationHubs.json#/resourceDefinitions/namespaces"
             },
diff --git a/schemas/2019-04-01/Microsoft.Capacity.json b/schemas/2019-04-01/Microsoft.Capacity.json
index b714d625ca..ebc7524c10 100644
--- a/schemas/2019-04-01/Microsoft.Capacity.json
+++ b/schemas/2019-04-01/Microsoft.Capacity.json
@@ -158,7 +158,19 @@
                 "RedHat",
                 "SqlDataWarehouse",
                 "VMwareCloudSimple",
-                "RedHatOsa"
+                "RedHatOsa",
+                "Databricks",
+                "AppService",
+                "ManagedDisk",
+                "BlockBlob",
+                "RedisCache",
+                "AzureDataExplorer",
+                "MySql",
+                "MariaDb",
+                "PostgreSql",
+                "DedicatedHost",
+                "SapHana",
+                "SqlAzureHybridBenefit"
               ]
             },
             {
diff --git a/schemas/2019-04-01/Microsoft.ContainerService.json b/schemas/2019-04-01/Microsoft.ContainerService.json
index 0a80b3cdcd..348d1ea7bc 100644
--- a/schemas/2019-04-01/Microsoft.ContainerService.json
+++ b/schemas/2019-04-01/Microsoft.ContainerService.json
@@ -1112,7 +1112,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2019-04-01/deploymentTemplate.json b/schemas/2019-04-01/deploymentTemplate.json
index ac810a4170..1e9e14d8e4 100644
--- a/schemas/2019-04-01/deploymentTemplate.json
+++ b/schemas/2019-04-01/deploymentTemplate.json
@@ -190,6 +190,12 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_fileServices_shares" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_managementPolicies" },
                   { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_privateEndpointConnections" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_encryptionScopes" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_objectReplicationPolicies" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_queueServices" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_queueServices_queues" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_tableServices" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2019-06-01/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_tableServices_tables" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-03-01-preview/Microsoft.Storage.json#/resourceDefinitions/storageAccounts" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-03-01-preview/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_managementPolicies" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-03-01-preview/Microsoft.Storage.json#/resourceDefinitions/storageAccounts_blobServices_containers" },
diff --git a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json
index 13f25f9050..944eaf5118 100644
--- a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json
+++ b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json
@@ -438,6 +438,17 @@
           ],
           "description": "Config server git properties payload"
         },
+        "networkProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Service network profile payload"
+        },
         "trace": {
           "oneOf": [
             {
@@ -814,6 +825,32 @@
       },
       "description": "Managed identity properties retrieved from ARM request headers."
     },
+    "NetworkProfile": {
+      "type": "object",
+      "properties": {
+        "appNetworkResourceGroup": {
+          "type": "string",
+          "description": "Name of the resource group containing network resources of Azure Spring Cloud Apps"
+        },
+        "appSubnetId": {
+          "type": "string",
+          "description": "Fully qualified resource Id of the subnet to host Azure Spring Cloud Apps"
+        },
+        "serviceCidr": {
+          "type": "string",
+          "description": "Azure Spring Cloud service reserved CIDR"
+        },
+        "serviceRuntimeNetworkResourceGroup": {
+          "type": "string",
+          "description": "Name of the resource group containing network resources of Azure Spring Cloud Service Runtime"
+        },
+        "serviceRuntimeSubnetId": {
+          "type": "string",
+          "description": "Fully qualified resource Id of the subnet to host Azure Spring Cloud Service Runtime"
+        }
+      },
+      "description": "Service network profile payload"
+    },
     "PersistentDisk": {
       "type": "object",
       "properties": {
diff --git a/schemas/2019-06-01/Microsoft.ContainerService.json b/schemas/2019-06-01/Microsoft.ContainerService.json
index cd5f7c38d4..5de019b237 100644
--- a/schemas/2019-06-01/Microsoft.ContainerService.json
+++ b/schemas/2019-06-01/Microsoft.ContainerService.json
@@ -1210,7 +1210,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2019-06-01/Microsoft.Storage.json b/schemas/2019-06-01/Microsoft.Storage.json
index 53b591d3f2..1479fabd6a 100644
--- a/schemas/2019-06-01/Microsoft.Storage.json
+++ b/schemas/2019-06-01/Microsoft.Storage.json
@@ -98,12 +98,24 @@
           "type": "array",
           "items": {
             "oneOf": [
+              {
+                "$ref": "#/definitions/storageAccounts_tableServices_childResource"
+              },
+              {
+                "$ref": "#/definitions/storageAccounts_queueServices_childResource"
+              },
               {
                 "$ref": "#/definitions/storageAccounts_fileServices_childResource"
               },
               {
                 "$ref": "#/definitions/storageAccounts_blobServices_childResource"
               },
+              {
+                "$ref": "#/definitions/storageAccounts_encryptionScopes_childResource"
+              },
+              {
+                "$ref": "#/definitions/storageAccounts_objectReplicationPolicies_childResource"
+              },
               {
                 "$ref": "#/definitions/storageAccounts_privateEndpointConnections_childResource"
               },
@@ -281,6 +293,47 @@
       ],
       "description": "Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies"
     },
+    "storageAccounts_encryptionScopes": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "minLength": 3,
+          "maxLength": 63,
+          "description": "The name of the encryption scope within the specified storage account. Encryption scope names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Storage/storageAccounts/encryptionScopes"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EncryptionScopeProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties of the encryption scope."
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/encryptionScopes"
+    },
     "storageAccounts_fileServices": {
       "type": "object",
       "properties": {
@@ -427,12 +480,52 @@
       ],
       "description": "Microsoft.Storage/storageAccounts/managementPolicies"
     },
+    "storageAccounts_objectReplicationPolicies": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "minLength": 1,
+          "description": "The ID of object replication policy or 'default' if the policy ID is unknown."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Storage/storageAccounts/objectReplicationPolicies"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ObjectReplicationPolicyProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Returns the Storage Account Object Replication Policy."
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/objectReplicationPolicies"
+    },
     "storageAccounts_privateEndpointConnections": {
       "type": "object",
       "properties": {
         "name": {
           "type": "string",
-          "description": "The name of the private endpoint connection associated with the Storage Account"
+          "description": "The name of the private endpoint connection associated with the Azure resource"
         },
         "type": {
           "type": "string",
@@ -464,6 +557,203 @@
         "apiVersion"
       ],
       "description": "Microsoft.Storage/storageAccounts/privateEndpointConnections"
+    },
+    "storageAccounts_queueServices": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "default"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the Queue Service within the specified storage account. Queue Service Name must be 'default'"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Storage/storageAccounts/queueServices"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/QueueServicePropertiesProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The properties of a storage account’s Queue service."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/storageAccounts_queueServices_queues_childResource"
+              }
+            ]
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/queueServices"
+    },
+    "storageAccounts_queueServices_queues": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-z0-9]([a-z0-9]|(-(?!-))){1,61}[a-z0-9]$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A queue name must be unique within a storage account and must be between 3 and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an alphanumeric character and it cannot have two consecutive dash(-) characters."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Storage/storageAccounts/queueServices/queues"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/QueueProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Queue resource properties."
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/queueServices/queues"
+    },
+    "storageAccounts_tableServices": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "default"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the Table Service within the specified storage account. Table Service Name must be 'default'"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Storage/storageAccounts/tableServices"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/TableServicePropertiesProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The properties of a storage account’s Table service."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/storageAccounts_tableServices_tables_childResource"
+              }
+            ]
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/tableServices"
+    },
+    "storageAccounts_tableServices_tables": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[A-Za-z][A-Za-z0-9]{2,62}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A table name must be unique within a storage account and must be between 3 and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin with a numeric character."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Storage/storageAccounts/tableServices/tables"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/tableServices/tables"
     }
   },
   "definitions": {
@@ -570,6 +860,17 @@
           ],
           "description": "The blob service properties for blob soft delete."
         },
+        "isVersioningEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Versioning is enabled if set to true."
+        },
         "automaticSnapshotPolicyEnabled": {
           "oneOf": [
             {
@@ -579,7 +880,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Automatic Snapshot is enabled if set to true."
+          "description": "Deprecated in favor of isVersioningEnabled property."
         },
         "changeFeed": {
           "oneOf": [
@@ -591,6 +892,28 @@
             }
           ],
           "description": "The blob service properties for change feed events."
+        },
+        "restorePolicy": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RestorePolicyProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The blob service properties for blob restore policy."
+        },
+        "containerDeleteRetentionPolicy": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DeleteRetentionPolicy"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The blob service properties for container soft delete."
         }
       },
       "description": "The properties of a storage account’s Blob service."
@@ -615,6 +938,21 @@
     "ContainerProperties": {
       "type": "object",
       "properties": {
+        "defaultEncryptionScope": {
+          "type": "string",
+          "description": "Default the container to use specified encryption scope for all writes."
+        },
+        "denyEncryptionScopeOverride": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Block override of encryption scope from the container default."
+        },
         "publicAccess": {
           "oneOf": [
             {
@@ -882,6 +1220,17 @@
           ],
           "description": "The encryption keySource (provider). Possible values (case-insensitive):  Microsoft.Storage, Microsoft.Keyvault."
         },
+        "requireInfrastructureEncryption": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A boolean indicating whether or not the service applies a secondary layer of encryption with platform managed keys for data at rest."
+        },
         "keyvaultproperties": {
           "oneOf": [
             {
@@ -899,6 +1248,63 @@
       ],
       "description": "The encryption settings on the storage account."
     },
+    "EncryptionScopeKeyVaultProperties": {
+      "type": "object",
+      "properties": {
+        "keyUri": {
+          "type": "string",
+          "description": "The object identifier for a key vault key object. When applied, the encryption scope will use the key referenced by the identifier to enable customer-managed key support on this encryption scope."
+        }
+      },
+      "description": "The key vault properties for the encryption scope. This is a required field if encryption scope 'source' attribute is set to 'Microsoft.KeyVault'."
+    },
+    "EncryptionScopeProperties": {
+      "type": "object",
+      "properties": {
+        "source": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Microsoft.Storage",
+                "Microsoft.KeyVault"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The provider for the encryption scope. Possible values (case-insensitive):  Microsoft.Storage, Microsoft.KeyVault."
+        },
+        "state": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The state of the encryption scope. Possible values (case-insensitive):  Enabled, Disabled."
+        },
+        "keyVaultProperties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EncryptionScopeKeyVaultProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The key vault properties for the encryption scope. This is a required field if encryption scope 'source' attribute is set to 'Microsoft.KeyVault'."
+        }
+      },
+      "description": "Properties of the encryption scope."
+    },
     "EncryptionService": {
       "type": "object",
       "properties": {
@@ -1038,6 +1444,54 @@
             }
           ],
           "description": "The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400."
+        },
+        "enabledProtocols": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "SMB",
+                "NFS"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The authentication protocol that is used for the file share. Can only be specified when creating a share."
+        },
+        "rootSquash": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "NoRootSquash",
+                "RootSquash",
+                "AllSquash"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The property is for NFS share only. The default is NoRootSquash."
+        },
+        "accessTier": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "TransactionOptimized",
+                "Hot",
+                "Cool",
+                "Premium"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Access tier for specific share. GpV2 account can choose between TransactionOptimized (default), Hot, and Cool. FileStorage account can choose Premium."
         }
       },
       "description": "The properties of the file share."
@@ -1071,11 +1525,19 @@
             }
           ],
           "description": "The immutability period for the blobs in the container since the policy creation, in days."
+        },
+        "allowProtectedAppendWrites": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "This property can only be changed for unlocked time-based retention policies. When enabled, new blocks can be written to an append blob while maintaining immutability protection and compliance. Only new blocks can be added and any existing blocks cannot be modified or deleted. This property cannot be changed with ExtendImmutabilityPolicy API"
         }
       },
-      "required": [
-        "immutabilityPeriodSinceCreationInDays"
-      ],
       "description": "The properties of an ImmutabilityPolicy of a blob container."
     },
     "IPRule": {
@@ -1251,6 +1713,20 @@
             }
           ],
           "description": "An array of predefined enum values. Only blockBlob is supported."
+        },
+        "blobIndexMatch": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/TagFilter"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "An array of blob index tag based filters, there can be at most 10 tag filters"
         }
       },
       "required": [
@@ -1431,6 +1907,95 @@
       ],
       "description": "Network rule set"
     },
+    "ObjectReplicationPolicyFilter": {
+      "type": "object",
+      "properties": {
+        "prefixMatch": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Optional. Filters the results to replicate only blobs whose names begin with the specified prefix."
+        },
+        "minCreationTime": {
+          "type": "string",
+          "description": "Blobs created after the time will be replicated to the destination. It must be in datetime format 'yyyy-MM-ddTHH:mm:ssZ'. Example: 2020-02-19T16:05:00Z"
+        }
+      },
+      "description": "Filters limit replication to a subset of blobs within the storage account. A logical OR is performed on values in the filter. If multiple filters are defined, a logical AND is performed on all filters."
+    },
+    "ObjectReplicationPolicyProperties": {
+      "type": "object",
+      "properties": {
+        "sourceAccount": {
+          "type": "string",
+          "description": "Required. Source account name."
+        },
+        "destinationAccount": {
+          "type": "string",
+          "description": "Required. Destination account name."
+        },
+        "rules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ObjectReplicationPolicyRule"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The storage account object replication rules."
+        }
+      },
+      "required": [
+        "sourceAccount",
+        "destinationAccount"
+      ],
+      "description": "The Storage Account ObjectReplicationPolicy properties."
+    },
+    "ObjectReplicationPolicyRule": {
+      "type": "object",
+      "properties": {
+        "ruleId": {
+          "type": "string",
+          "description": "Rule Id is auto-generated for each new rule on destination account. It is required for put policy on source account."
+        },
+        "sourceContainer": {
+          "type": "string",
+          "description": "Required. Source container name."
+        },
+        "destinationContainer": {
+          "type": "string",
+          "description": "Required. Destination container name."
+        },
+        "filters": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ObjectReplicationPolicyFilter"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Optional. An object that defines the filter set."
+        }
+      },
+      "required": [
+        "sourceContainer",
+        "destinationContainer"
+      ],
+      "description": "The replication policy rule between two containers."
+    },
     "PrivateEndpoint": {
       "description": "The Private Endpoint resource."
     },
@@ -1512,25 +2077,46 @@
       },
       "description": "A collection of information about the state of the connection between service consumer and provider."
     },
-    "RoutingPreference": {
+    "QueueProperties": {
       "type": "object",
       "properties": {
-        "routingChoice": {
+        "metadata": {
           "oneOf": [
             {
-              "type": "string",
-              "enum": [
-                "MicrosoftRouting",
-                "InternetRouting"
-              ]
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Routing Choice defines the kind of network routing opted by the user."
-        },
-        "publishMicrosoftEndpoints": {
+          "description": "A name-value pair that represents queue metadata."
+        }
+      }
+    },
+    "QueueServicePropertiesProperties": {
+      "type": "object",
+      "properties": {
+        "cors": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CorsRules"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies CORS rules for the Queue service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the Queue service."
+        }
+      },
+      "description": "The properties of a storage account’s Queue service."
+    },
+    "RestorePolicyProperties": {
+      "type": "object",
+      "properties": {
+        "enabled": {
           "oneOf": [
             {
               "type": "boolean"
@@ -1539,38 +2125,86 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "A boolean flag which indicates whether microsoft routing storage endpoints are to be published"
+          "description": "Blob restore is enabled if set to true."
         },
-        "publishInternetEndpoints": {
+        "days": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "integer",
+              "minimum": 1,
+              "maximum": 365
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "A boolean flag which indicates whether internet routing storage endpoints are to be published"
+          "description": "how long this blob can be restored. It should be great than zero and less than DeleteRetentionPolicy.days."
         }
       },
-      "description": "Routing preference defines the type of network, either microsoft or internet routing to be used to deliver the user data, the default option is microsoft routing"
+      "required": [
+        "enabled"
+      ],
+      "description": "The blob service properties for blob restore policy"
     },
-    "Sku": {
+    "RoutingPreference": {
       "type": "object",
       "properties": {
-        "name": {
+        "routingChoice": {
           "oneOf": [
             {
               "type": "string",
               "enum": [
-                "Standard_LRS",
-                "Standard_GRS",
-                "Standard_RAGRS",
-                "Standard_ZRS",
-                "Premium_LRS",
-                "Premium_ZRS",
-                "Standard_GZRS",
-                "Standard_RAGZRS"
+                "MicrosoftRouting",
+                "InternetRouting"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Routing Choice defines the kind of network routing opted by the user."
+        },
+        "publishMicrosoftEndpoints": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A boolean flag which indicates whether microsoft routing storage endpoints are to be published"
+        },
+        "publishInternetEndpoints": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A boolean flag which indicates whether internet routing storage endpoints are to be published"
+        }
+      },
+      "description": "Routing preference defines the type of network, either microsoft or internet routing to be used to deliver the user data, the default option is microsoft routing"
+    },
+    "Sku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard_LRS",
+                "Standard_GRS",
+                "Standard_RAGRS",
+                "Standard_ZRS",
+                "Premium_LRS",
+                "Premium_ZRS",
+                "Standard_GZRS",
+                "Standard_RAGZRS"
               ]
             },
             {
@@ -1707,6 +2341,33 @@
             }
           ],
           "description": "Maintains information about the network routing choice opted by the user for data transfer"
+        },
+        "allowBlobPublicAccess": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Allow or disallow public access to all blobs or containers in the storage account. The default interpretation is true for this property."
+        },
+        "minimumTlsVersion": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "TLS1_0",
+                "TLS1_1",
+                "TLS1_2"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Set the minimum TLS version to be permitted on requests to storage. The default interpretation is TLS 1.0 for this property."
         }
       },
       "description": "The parameters used to create the storage account."
@@ -1865,6 +2526,45 @@
       ],
       "description": "Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies"
     },
+    "storageAccounts_encryptionScopes_childResource": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of the encryption scope within the specified storage account. Encryption scope names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "encryptionScopes"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EncryptionScopeProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties of the encryption scope."
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/encryptionScopes"
+    },
     "storageAccounts_fileServices_childResource": {
       "type": "object",
       "properties": {
@@ -2009,12 +2709,51 @@
       ],
       "description": "Microsoft.Storage/storageAccounts/managementPolicies"
     },
+    "storageAccounts_objectReplicationPolicies_childResource": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The ID of object replication policy or 'default' if the policy ID is unknown."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "objectReplicationPolicies"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ObjectReplicationPolicyProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Returns the Storage Account Object Replication Policy."
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/objectReplicationPolicies"
+    },
     "storageAccounts_privateEndpointConnections_childResource": {
       "type": "object",
       "properties": {
         "name": {
           "type": "string",
-          "description": "The name of the private endpoint connection associated with the Storage Account"
+          "description": "The name of the private endpoint connection associated with the Azure resource"
         },
         "type": {
           "type": "string",
@@ -2047,6 +2786,249 @@
       ],
       "description": "Microsoft.Storage/storageAccounts/privateEndpointConnections"
     },
+    "storageAccounts_queueServices_childResource": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "default"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the Queue Service within the specified storage account. Queue Service Name must be 'default'"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "queueServices"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/QueueServicePropertiesProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The properties of a storage account’s Queue service."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/storageAccounts_queueServices_queues_childResource"
+              }
+            ]
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/queueServices"
+    },
+    "storageAccounts_queueServices_queues_childResource": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-z0-9]([a-z0-9]|(-(?!-))){1,61}[a-z0-9]$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A queue name must be unique within a storage account and must be between 3 and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only, it should begin and end with an alphanumeric character and it cannot have two consecutive dash(-) characters."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "queues"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/QueueProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Queue resource properties."
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/queueServices/queues"
+    },
+    "storageAccounts_tableServices_childResource": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "default"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the Table Service within the specified storage account. Table Service Name must be 'default'"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "tableServices"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/TableServicePropertiesProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The properties of a storage account’s Table service."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/storageAccounts_tableServices_tables_childResource"
+              }
+            ]
+          }
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/tableServices"
+    },
+    "storageAccounts_tableServices_tables_childResource": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[A-Za-z][A-Za-z0-9]{2,62}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A table name must be unique within a storage account and must be between 3 and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin with a numeric character."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "tables"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-06-01"
+          ]
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion"
+      ],
+      "description": "Microsoft.Storage/storageAccounts/tableServices/tables"
+    },
+    "TableServicePropertiesProperties": {
+      "type": "object",
+      "properties": {
+        "cors": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CorsRules"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies CORS rules for the Table service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the Table service."
+        }
+      },
+      "description": "The properties of a storage account’s Table service."
+    },
+    "TagFilter": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 128,
+          "description": "This is the filter tag name, it can have 1 - 128 characters"
+        },
+        "op": {
+          "type": "string",
+          "description": "This is the comparison operator which is used for object comparison and filtering. Only == (equality operator) is currently supported"
+        },
+        "value": {
+          "type": "string",
+          "minLength": 0,
+          "maxLength": 256,
+          "description": "This is the filter tag value field used for tag based filtering, it can have 0 - 256 characters"
+        }
+      },
+      "required": [
+        "name",
+        "op",
+        "value"
+      ],
+      "description": "Blob index tag based filtering for blob objects"
+    },
     "VirtualNetworkRule": {
       "type": "object",
       "properties": {
diff --git a/schemas/2019-08-01/Microsoft.ContainerService.json b/schemas/2019-08-01/Microsoft.ContainerService.json
index 4e35c08d4b..12c29b9b8a 100644
--- a/schemas/2019-08-01/Microsoft.ContainerService.json
+++ b/schemas/2019-08-01/Microsoft.ContainerService.json
@@ -1362,7 +1362,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json
index 19fd090ac9..762e1a784f 100644
--- a/schemas/2019-08-01/tenantDeploymentTemplate.json
+++ b/schemas/2019-08-01/tenantDeploymentTemplate.json
@@ -236,6 +236,9 @@
                   },
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2017-11-01-preview/Microsoft.Subscription.json#/tenant_resourceDefinitions/subscriptionDefinitions"
+                  },
+                  {
+                    "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Subscription.json#/tenant_resourceDefinitions/aliases"
                   }
                 ]
               }
diff --git a/schemas/2019-10-01-preview/Microsoft.Subscription.json b/schemas/2019-10-01-preview/Microsoft.Subscription.json
new file mode 100644
index 0000000000..2582f71fd3
--- /dev/null
+++ b/schemas/2019-10-01-preview/Microsoft.Subscription.json
@@ -0,0 +1,88 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Subscription.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Subscription",
+  "description": "Microsoft Subscription Resource Types",
+  "resourceDefinitions": {},
+  "tenant_resourceDefinitions": {
+    "aliases": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-10-01-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Alias Name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PutAliasRequestProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Put subscription properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Subscription/aliases"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Subscription/aliases"
+    }
+  },
+  "definitions": {
+    "PutAliasRequestProperties": {
+      "type": "object",
+      "properties": {
+        "billingScope": {
+          "type": "string",
+          "description": "Determines whether subscription is fieldLed, partnerLed or LegacyEA"
+        },
+        "displayName": {
+          "type": "string",
+          "description": "The friendly name of the subscription."
+        },
+        "subscriptionId": {
+          "type": "string",
+          "description": "This parameter can be used to create alias for existing subscription Id"
+        },
+        "workload": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Production",
+                "DevTest"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The workload type of the subscription. It can be either Production or DevTest."
+        }
+      },
+      "required": [
+        "billingScope",
+        "displayName",
+        "workload"
+      ],
+      "description": "Put subscription properties."
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/2019-10-01/Microsoft.ContainerService.json b/schemas/2019-10-01/Microsoft.ContainerService.json
index 94973b51bd..0f29e89189 100644
--- a/schemas/2019-10-01/Microsoft.ContainerService.json
+++ b/schemas/2019-10-01/Microsoft.ContainerService.json
@@ -1362,7 +1362,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2019-11-01/Microsoft.ContainerService.json b/schemas/2019-11-01/Microsoft.ContainerService.json
index a73dba6b8f..d75d63e607 100644
--- a/schemas/2019-11-01/Microsoft.ContainerService.json
+++ b/schemas/2019-11-01/Microsoft.ContainerService.json
@@ -1482,7 +1482,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2019-11-01/Microsoft.DataShare.json b/schemas/2019-11-01/Microsoft.DataShare.json
index fc1a3d4e0d..cb6d211c05 100644
--- a/schemas/2019-11-01/Microsoft.DataShare.json
+++ b/schemas/2019-11-01/Microsoft.DataShare.json
@@ -198,22 +198,22 @@
       "type": "object",
       "oneOf": [
         {
-          "$ref": "#/definitions/BlobDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FileDataSetMapping"
         },
         {
-          "$ref": "#/definitions/BlobFolderDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FileSystemDataSetMapping"
         },
         {
-          "$ref": "#/definitions/BlobContainerDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FolderDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileDataSetMapping"
+          "$ref": "#/definitions/BlobContainerDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FolderDataSetMapping"
+          "$ref": "#/definitions/BlobDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileSystemDataSetMapping"
+          "$ref": "#/definitions/BlobFolderDataSetMapping"
         },
         {
           "$ref": "#/definitions/KustoClusterDataSetMapping"
@@ -222,10 +222,10 @@
           "$ref": "#/definitions/KustoDatabaseDataSetMapping"
         },
         {
-          "$ref": "#/definitions/SqlDWTableDataSetMapping"
+          "$ref": "#/definitions/SqlDBTableDataSetMapping"
         },
         {
-          "$ref": "#/definitions/SqlDBTableDataSetMapping"
+          "$ref": "#/definitions/SqlDWTableDataSetMapping"
         }
       ],
       "properties": {
@@ -289,28 +289,28 @@
       "type": "object",
       "oneOf": [
         {
-          "$ref": "#/definitions/BlobDataSet"
+          "$ref": "#/definitions/ADLSGen1FileDataSet"
         },
         {
-          "$ref": "#/definitions/BlobFolderDataSet"
+          "$ref": "#/definitions/ADLSGen1FolderDataSet"
         },
         {
-          "$ref": "#/definitions/BlobContainerDataSet"
+          "$ref": "#/definitions/ADLSGen2FileDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileDataSet"
+          "$ref": "#/definitions/ADLSGen2FileSystemDataSet"
         },
         {
           "$ref": "#/definitions/ADLSGen2FolderDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileSystemDataSet"
+          "$ref": "#/definitions/BlobContainerDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen1FolderDataSet"
+          "$ref": "#/definitions/BlobDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen1FileDataSet"
+          "$ref": "#/definitions/BlobFolderDataSet"
         },
         {
           "$ref": "#/definitions/KustoClusterDataSet"
@@ -319,10 +319,10 @@
           "$ref": "#/definitions/KustoDatabaseDataSet"
         },
         {
-          "$ref": "#/definitions/SqlDWTableDataSet"
+          "$ref": "#/definitions/SqlDBTableDataSet"
         },
         {
-          "$ref": "#/definitions/SqlDBTableDataSet"
+          "$ref": "#/definitions/SqlDWTableDataSet"
         }
       ],
       "properties": {
@@ -471,22 +471,22 @@
       "type": "object",
       "oneOf": [
         {
-          "$ref": "#/definitions/BlobDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FileDataSetMapping"
         },
         {
-          "$ref": "#/definitions/BlobFolderDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FileSystemDataSetMapping"
         },
         {
-          "$ref": "#/definitions/BlobContainerDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FolderDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileDataSetMapping"
+          "$ref": "#/definitions/BlobContainerDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FolderDataSetMapping"
+          "$ref": "#/definitions/BlobDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileSystemDataSetMapping"
+          "$ref": "#/definitions/BlobFolderDataSetMapping"
         },
         {
           "$ref": "#/definitions/KustoClusterDataSetMapping"
@@ -495,10 +495,10 @@
           "$ref": "#/definitions/KustoDatabaseDataSetMapping"
         },
         {
-          "$ref": "#/definitions/SqlDWTableDataSetMapping"
+          "$ref": "#/definitions/SqlDBTableDataSetMapping"
         },
         {
-          "$ref": "#/definitions/SqlDBTableDataSetMapping"
+          "$ref": "#/definitions/SqlDWTableDataSetMapping"
         }
       ],
       "properties": {
@@ -601,28 +601,28 @@
       "type": "object",
       "oneOf": [
         {
-          "$ref": "#/definitions/BlobDataSet"
+          "$ref": "#/definitions/ADLSGen1FileDataSet"
         },
         {
-          "$ref": "#/definitions/BlobFolderDataSet"
+          "$ref": "#/definitions/ADLSGen1FolderDataSet"
         },
         {
-          "$ref": "#/definitions/BlobContainerDataSet"
+          "$ref": "#/definitions/ADLSGen2FileDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileDataSet"
+          "$ref": "#/definitions/ADLSGen2FileSystemDataSet"
         },
         {
           "$ref": "#/definitions/ADLSGen2FolderDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileSystemDataSet"
+          "$ref": "#/definitions/BlobContainerDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen1FolderDataSet"
+          "$ref": "#/definitions/BlobDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen1FileDataSet"
+          "$ref": "#/definitions/BlobFolderDataSet"
         },
         {
           "$ref": "#/definitions/KustoClusterDataSet"
@@ -631,10 +631,10 @@
           "$ref": "#/definitions/KustoDatabaseDataSet"
         },
         {
-          "$ref": "#/definitions/SqlDWTableDataSet"
+          "$ref": "#/definitions/SqlDBTableDataSet"
         },
         {
-          "$ref": "#/definitions/SqlDBTableDataSet"
+          "$ref": "#/definitions/SqlDWTableDataSet"
         }
       ],
       "properties": {
diff --git a/schemas/2019-11-01/Microsoft.StorageCache.json b/schemas/2019-11-01/Microsoft.StorageCache.json
index 2c27735232..b7b699f229 100644
--- a/schemas/2019-11-01/Microsoft.StorageCache.json
+++ b/schemas/2019-11-01/Microsoft.StorageCache.json
@@ -351,6 +351,22 @@
           ],
           "description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property."
         },
+        "targetType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "nfs3",
+                "clfs",
+                "unknown"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Type of the Storage Target."
+        },
         "unknown": {
           "oneOf": [
             {
diff --git a/schemas/2020-01-01-privatepreview/Microsoft.DBforPostgreSQL.json b/schemas/2020-01-01-privatepreview/Microsoft.DBforPostgreSQL.json
deleted file mode 100644
index 796b45ee72..0000000000
--- a/schemas/2020-01-01-privatepreview/Microsoft.DBforPostgreSQL.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2020-01-01-privatepreview/Microsoft.DBforPostgreSQL.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.DBforPostgreSQL",
-  "description": "Microsoft DBforPostgreSQL Resource Types",
-  "resourceDefinitions": {
-    "servers_keys": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-01-01-privatepreview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the PostgreSQL Server key to be operated on (updated or created)."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ServerKeyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties for a key execution."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforPostgreSQL/servers/keys"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/servers/keys"
-    }
-  },
-  "definitions": {
-    "ServerKeyProperties": {
-      "type": "object",
-      "properties": {
-        "serverKeyType": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "AzureKeyVault"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The key type like 'AzureKeyVault'."
-        },
-        "uri": {
-          "type": "string",
-          "description": "The URI of the key."
-        }
-      },
-      "required": [
-        "serverKeyType"
-      ],
-      "description": "Properties for a key execution."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2020-01-01/Microsoft.ContainerService.json b/schemas/2020-01-01/Microsoft.ContainerService.json
index fd22fc381c..54616fd4cd 100644
--- a/schemas/2020-01-01/Microsoft.ContainerService.json
+++ b/schemas/2020-01-01/Microsoft.ContainerService.json
@@ -1486,7 +1486,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2020-01-01/Microsoft.DBforMariaDB.json b/schemas/2020-01-01/Microsoft.DBforMariaDB.json
deleted file mode 100644
index 766729b13c..0000000000
--- a/schemas/2020-01-01/Microsoft.DBforMariaDB.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.DBforMariaDB.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.DBforMariaDB",
-  "description": "Microsoft DBforMariaDB Resource Types",
-  "resourceDefinitions": {
-    "servers_securityAlertPolicies": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-01-01"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^.*/Default$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the security alert policy."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SecurityAlertsPolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of a security alert policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforMariaDB/servers/securityAlertPolicies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforMariaDB/servers/securityAlertPolicies"
-    }
-  },
-  "definitions": {
-    "SecurityAlertsPolicyProperties": {
-      "type": "object",
-      "properties": {
-        "state": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Enabled",
-                "Disabled"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Specifies the state of the policy, whether it is enabled or disabled."
-        }
-      },
-      "required": [
-        "state"
-      ],
-      "description": "Properties of a security alert policy."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2020-01-01/Microsoft.DBforMySQL.json b/schemas/2020-01-01/Microsoft.DBforMySQL.json
index 5fc2a861fa..36086eb95e 100644
--- a/schemas/2020-01-01/Microsoft.DBforMySQL.json
+++ b/schemas/2020-01-01/Microsoft.DBforMySQL.json
@@ -42,80 +42,9 @@
         "type"
       ],
       "description": "Microsoft.DBforMySQL/servers/keys"
-    },
-    "servers_securityAlertPolicies": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-01-01"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^.*/Default$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the security alert policy."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SecurityAlertsPolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of a security alert policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforMySQL/servers/securityAlertPolicies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforMySQL/servers/securityAlertPolicies"
     }
   },
   "definitions": {
-    "SecurityAlertsPolicyProperties": {
-      "type": "object",
-      "properties": {
-        "state": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Enabled",
-                "Disabled"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Specifies the state of the policy, whether it is enabled or disabled."
-        }
-      },
-      "required": [
-        "state"
-      ],
-      "description": "Properties of a security alert policy."
-    },
     "ServerKeyProperties": {
       "type": "object",
       "properties": {
diff --git a/schemas/2020-01-01/Microsoft.DBforPostgreSQL.json b/schemas/2020-01-01/Microsoft.DBforPostgreSQL.json
index afe540d8c1..8bed778bc9 100644
--- a/schemas/2020-01-01/Microsoft.DBforPostgreSQL.json
+++ b/schemas/2020-01-01/Microsoft.DBforPostgreSQL.json
@@ -42,80 +42,9 @@
         "type"
       ],
       "description": "Microsoft.DBforPostgreSQL/servers/keys"
-    },
-    "servers_securityAlertPolicies": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-01-01"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^.*/Default$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the security alert policy."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SecurityAlertsPolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of a security alert policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBforPostgreSQL/servers/securityAlertPolicies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBforPostgreSQL/servers/securityAlertPolicies"
     }
   },
   "definitions": {
-    "SecurityAlertsPolicyProperties": {
-      "type": "object",
-      "properties": {
-        "state": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Enabled",
-                "Disabled"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Specifies the state of the policy, whether it is enabled or disabled."
-        }
-      },
-      "required": [
-        "state"
-      ],
-      "description": "Properties of a security alert policy."
-    },
     "ServerKeyProperties": {
       "type": "object",
       "properties": {
diff --git a/schemas/2020-02-01-preview/Microsoft.Maps.json b/schemas/2020-02-01-preview/Microsoft.Maps.json
index f9f374266a..cdfcbfbd34 100644
--- a/schemas/2020-02-01-preview/Microsoft.Maps.json
+++ b/schemas/2020-02-01-preview/Microsoft.Maps.json
@@ -27,6 +27,9 @@
             "oneOf": [
               {
                 "$ref": "#/definitions/accounts_privateAtlases_childResource"
+              },
+              {
+                "$ref": "#/definitions/accounts_creators_childResource"
               }
             ]
           }
@@ -73,6 +76,53 @@
       ],
       "description": "Microsoft.Maps/accounts"
     },
+    "accounts_creators": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-02-01-preview"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "The location of the resource."
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the Maps Creator instance."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Maps/accounts/creators"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "type"
+      ],
+      "description": "Microsoft.Maps/accounts/creators"
+    },
     "accounts_privateAtlases": {
       "type": "object",
       "properties": {
@@ -122,6 +172,53 @@
     }
   },
   "definitions": {
+    "accounts_creators_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-02-01-preview"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "The location of the resource."
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the Maps Creator instance."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "creators"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "type"
+      ],
+      "description": "Microsoft.Maps/accounts/creators"
+    },
     "accounts_privateAtlases_childResource": {
       "type": "object",
       "properties": {
diff --git a/schemas/2020-02-01/Microsoft.ContainerService.json b/schemas/2020-02-01/Microsoft.ContainerService.json
index 573528b352..c6e5bd7336 100644
--- a/schemas/2020-02-01/Microsoft.ContainerService.json
+++ b/schemas/2020-02-01/Microsoft.ContainerService.json
@@ -1538,7 +1538,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2020-02-14-privatepreview/Microsoft.DBforPostgreSQL.json b/schemas/2020-02-14-privatepreview/Microsoft.DBforPostgreSQL.json
deleted file mode 100644
index ed5c40f5ed..0000000000
--- a/schemas/2020-02-14-privatepreview/Microsoft.DBforPostgreSQL.json
+++ /dev/null
@@ -1,567 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2020-02-14-privatepreview/Microsoft.DBforPostgreSQL.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.DBForPostgreSql",
-  "description": "Microsoft DBForPostgreSql Resource Types",
-  "resourceDefinitions": {
-    "flexibleServers": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-02-14-privatepreview"
-          ]
-        },
-        "identity": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Identity"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Identity for the resource."
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the server."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ServerProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a server."
-        },
-        "resources": {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {
-                "$ref": "#/definitions/flexibleServers_firewallRules_childResource"
-              },
-              {
-                "$ref": "#/definitions/flexibleServers_maintenanceWindows_childResource"
-              }
-            ]
-          }
-        },
-        "sku": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Sku"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Sku information related properties of a server."
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Resource tags."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers"
-    },
-    "flexibleServers_firewallRules": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-02-14-privatepreview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the server firewall rule."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/FirewallRuleProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a server firewall rule."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers/firewallRules"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/firewallRules"
-    },
-    "flexibleServers_maintenanceWindows": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-02-14-privatepreview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the maintenance window."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/CustomerMaintenanceWindowProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a server firewall rule."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers/maintenanceWindows"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/maintenanceWindows"
-    }
-  },
-  "definitions": {
-    "CustomerMaintenanceWindowProperties": {
-      "type": "object",
-      "properties": {
-        "dayOfWeek": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The day of week of the customer maintenance window to start"
-        },
-        "durationInMinutes": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The duration of the customer maintenance window to run."
-        },
-        "startHour": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The starting hour of the customer maintenance window."
-        },
-        "startMinute": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The starting minutes of the customer maintenance window."
-        }
-      },
-      "required": [
-        "dayOfWeek",
-        "startHour",
-        "startMinute"
-      ],
-      "description": "The properties of a server firewall rule."
-    },
-    "FirewallRuleProperties": {
-      "type": "object",
-      "properties": {
-        "endIpAddress": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The end IP address of the server firewall rule. Must be IPv4 format."
-        },
-        "startIpAddress": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The start IP address of the server firewall rule. Must be IPv4 format."
-        }
-      },
-      "required": [
-        "endIpAddress",
-        "startIpAddress"
-      ],
-      "description": "The properties of a server firewall rule."
-    },
-    "flexibleServers_firewallRules_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-02-14-privatepreview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the server firewall rule."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/FirewallRuleProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a server firewall rule."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "firewallRules"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/firewallRules"
-    },
-    "flexibleServers_maintenanceWindows_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-02-14-privatepreview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the maintenance window."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/CustomerMaintenanceWindowProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a server firewall rule."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "maintenanceWindows"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/maintenanceWindows"
-    },
-    "Identity": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "SystemAssigned"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The identity type."
-        }
-      },
-      "description": "Identity for the resource."
-    },
-    "ServerProperties": {
-      "type": "object",
-      "properties": {
-        "administratorLogin": {
-          "type": "string",
-          "description": "The administrator's login name of a server. Can only be specified when the server is being created (and is required for creation)."
-        },
-        "administratorLoginPassword": {
-          "type": "string",
-          "format": "password",
-          "description": "The administrator login password (required for server creation)."
-        },
-        "availabilityZone": {
-          "type": "string",
-          "description": "availability Zone information of the server."
-        },
-        "createMode": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Default",
-                "PointInTimeRestore"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The mode to create a new PostgreSQL server."
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The display name of a server."
-        },
-        "pointInTimeUTC": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Restore point creation time (ISO8601 format), specifying the time to restore from."
-        },
-        "publicNetworkAccess": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Enabled",
-                "Disabled"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "public network access is enabled or not."
-        },
-        "sourceServerName": {
-          "type": "string",
-          "description": "The source PostgreSQL server name to restore from."
-        },
-        "standbyCount": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "stand by count value can be either 0 or 1"
-        },
-        "storageProfile": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/StorageProfile"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Storage Profile properties of a server"
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Application-specific metadata in the form of key-value pairs."
-        },
-        "version": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "12"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "PostgreSQL Server version."
-        },
-        "vnetInjArgs": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ServerPropertiesVnetInjArgs"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        }
-      },
-      "description": "The properties of a server."
-    },
-    "ServerPropertiesVnetInjArgs": {
-      "type": "object",
-      "properties": {
-        "delegatedSubnetName": {
-          "type": "string",
-          "description": "delegated subnet name"
-        },
-        "delegatedVnetID": {
-          "type": "string",
-          "description": "delegated vNet ID"
-        },
-        "delegatedVnetName": {
-          "type": "string",
-          "description": "delegated vNet name"
-        },
-        "delegatedVnetResourceGroup": {
-          "type": "string",
-          "description": "delegated vNet resource group name"
-        }
-      }
-    },
-    "Sku": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "The name of the sku, typically, tier + family + cores, e.g. Standard_D4s_v3."
-        },
-        "tier": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Burstable",
-                "GeneralPurpose",
-                "MemoryOptimized"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The tier of the particular SKU, e.g. Burstable."
-        }
-      },
-      "description": "Sku information related properties of a server."
-    },
-    "StorageProfile": {
-      "type": "object",
-      "properties": {
-        "backupRetentionDays": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Backup retention days for the server."
-        },
-        "storageMB": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Max storage allowed for a server."
-        }
-      },
-      "description": "Storage Profile properties of a server"
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2020-03-01-preview/Microsoft.OperationalInsights.json b/schemas/2020-03-01-preview/Microsoft.OperationalInsights.json
index 6d7564e35e..0e95134e85 100644
--- a/schemas/2020-03-01-preview/Microsoft.OperationalInsights.json
+++ b/schemas/2020-03-01-preview/Microsoft.OperationalInsights.json
@@ -946,7 +946,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The workspace daily quota for ingestion. -1 means unlimited."
+          "description": "The workspace daily quota for ingestion."
         }
       },
       "description": "The daily volume cap for ingestion."
diff --git a/schemas/2020-03-01/Microsoft.ContainerService.json b/schemas/2020-03-01/Microsoft.ContainerService.json
index 90d472911c..39cf5df7c9 100644
--- a/schemas/2020-03-01/Microsoft.ContainerService.json
+++ b/schemas/2020-03-01/Microsoft.ContainerService.json
@@ -1599,7 +1599,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2020-03-01/Microsoft.StorageCache.json b/schemas/2020-03-01/Microsoft.StorageCache.json
index a31bbbfd2e..34cea2a853 100644
--- a/schemas/2020-03-01/Microsoft.StorageCache.json
+++ b/schemas/2020-03-01/Microsoft.StorageCache.json
@@ -375,7 +375,7 @@
     "ClfsTargetProperties": {
       "type": "object",
       "properties": {
-        "targetBaseType": {
+        "targetType": {
           "type": "string",
           "enum": [
             "clfs"
@@ -383,7 +383,7 @@
         }
       },
       "required": [
-        "targetBaseType"
+        "targetType"
       ],
       "description": "Storage container for use as a CLFS Storage Target."
     },
@@ -465,7 +465,7 @@
     "Nfs3TargetProperties": {
       "type": "object",
       "properties": {
-        "targetBaseType": {
+        "targetType": {
           "type": "string",
           "enum": [
             "nfs3"
@@ -473,7 +473,7 @@
         }
       },
       "required": [
-        "targetBaseType"
+        "targetType"
       ],
       "description": "An NFSv3 mount point for use as a Storage Target."
     },
@@ -546,10 +546,6 @@
           ],
           "description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property."
         },
-        "targetType": {
-          "type": "string",
-          "description": "Type of the Storage Target."
-        },
         "unknown": {
           "oneOf": [
             {
@@ -588,7 +584,7 @@
     "UnknownTargetProperties": {
       "type": "object",
       "properties": {
-        "targetBaseType": {
+        "targetType": {
           "type": "string",
           "enum": [
             "unknown"
@@ -596,7 +592,7 @@
         }
       },
       "required": [
-        "targetBaseType"
+        "targetType"
       ],
       "description": "Storage container for use as an Unknown Storage Target."
     }
diff --git a/schemas/2020-04-01/Microsoft.ContainerService.json b/schemas/2020-04-01/Microsoft.ContainerService.json
index afb439bdd0..970597841d 100644
--- a/schemas/2020-04-01/Microsoft.ContainerService.json
+++ b/schemas/2020-04-01/Microsoft.ContainerService.json
@@ -1637,7 +1637,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2020-04-01/Microsoft.DocumentDB.json b/schemas/2020-04-01/Microsoft.DocumentDB.json
index 9fc58f0bbb..6851377356 100644
--- a/schemas/2020-04-01/Microsoft.DocumentDB.json
+++ b/schemas/2020-04-01/Microsoft.DocumentDB.json
@@ -1999,6 +1999,44 @@
       },
       "description": "The configuration of the partition key to be used for partitioning data into multiple partitions"
     },
+    "CorsPolicy": {
+      "type": "object",
+      "properties": {
+        "allowedHeaders": {
+          "type": "string",
+          "description": "The request headers that the origin domain may specify on the CORS request."
+        },
+        "allowedMethods": {
+          "type": "string",
+          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request."
+        },
+        "allowedOrigins": {
+          "type": "string",
+          "description": "The origin domains that are permitted to make a request against the service via CORS."
+        },
+        "exposedHeaders": {
+          "type": "string",
+          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer."
+        },
+        "maxAgeInSeconds": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 1,
+              "maximum": 2147483647
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request."
+        }
+      },
+      "required": [
+        "allowedOrigins"
+      ],
+      "description": "The CORS policy for the Cosmos DB database account."
+    },
     "CreateUpdateOptions": {
       "type": "object",
       "properties": {
@@ -2078,6 +2116,20 @@
           ],
           "description": "The consistency policy for the Cosmos DB database account."
         },
+        "cors": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/CorsPolicy"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The CORS policy for the Cosmos DB database account."
+        },
         "databaseAccountOfferType": {
           "oneOf": [
             {
@@ -4142,6 +4194,17 @@
     "SqlContainerResource": {
       "type": "object",
       "properties": {
+        "analyticalStorageTtl": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Analytical TTL."
+        },
         "conflictResolutionPolicy": {
           "oneOf": [
             {
diff --git a/schemas/2020-04-15/Microsoft.Cdn.json b/schemas/2020-04-15/Microsoft.Cdn.json
index f575470317..b36d4e804b 100644
--- a/schemas/2020-04-15/Microsoft.Cdn.json
+++ b/schemas/2020-04-15/Microsoft.Cdn.json
@@ -970,6 +970,9 @@
         {
           "$ref": "#/definitions/UrlRedirectAction"
         },
+        {
+          "$ref": "#/definitions/UrlSigningAction"
+        },
         {
           "$ref": "#/definitions/UrlRewriteAction"
         },
@@ -4093,6 +4096,101 @@
       ],
       "description": "Defines the parameters for the url rewrite action."
     },
+    "UrlSigningAction": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "enum": [
+            "UrlSigning"
+          ]
+        },
+        "parameters": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UrlSigningActionParameters"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Defines the parameters for the Url Signing action."
+        }
+      },
+      "required": [
+        "name",
+        "parameters"
+      ],
+      "description": "Defines the url signing action for the delivery rule."
+    },
+    "UrlSigningActionParameters": {
+      "type": "object",
+      "properties": {
+        "@odata.type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlSigningActionParameters"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "algorithm": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "SHA256"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Algorithm to use for URL signing."
+        },
+        "ipSubnets": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Match values to match against. Supports CIDR ranges (both IPv4 and IPv6)."
+        },
+        "keyId": {
+          "type": "string",
+          "description": "Id reference of the key to be used to verify the hash and should be defined in UrlSigningKeys"
+        },
+        "parameterNameOverride": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/UrlSigningParamIdentifier"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Defines which query string parameters in the url to be considered for expires, key id etc. "
+        }
+      },
+      "required": [
+        "keyId"
+      ],
+      "description": "Defines the parameters for the Url Signing action."
+    },
     "UrlSigningKey": {
       "type": "object",
       "properties": {
@@ -4117,6 +4215,36 @@
         "keySourceParameters"
       ],
       "description": "Url signing key"
+    },
+    "UrlSigningParamIdentifier": {
+      "type": "object",
+      "properties": {
+        "paramIndicator": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Expires",
+                "KeyId",
+                "Signature"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates the purpose of the parameter."
+        },
+        "paramName": {
+          "type": "string",
+          "description": "Parameter name"
+        }
+      },
+      "required": [
+        "paramIndicator",
+        "paramName"
+      ],
+      "description": "Defines how to identify a parameter for a specific purpose e.g. expires"
     }
   }
 }
\ No newline at end of file
diff --git a/schemas/2020-06-01-preview/Microsoft.DocumentDB.json b/schemas/2020-06-01-preview/Microsoft.DocumentDB.json
index faa63b42bd..e3ff6dd359 100644
--- a/schemas/2020-06-01-preview/Microsoft.DocumentDB.json
+++ b/schemas/2020-06-01-preview/Microsoft.DocumentDB.json
@@ -2100,6 +2100,10 @@
       },
       "description": "Cosmos DB Cassandra table column"
     },
+    "Components1jq1t4ischemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties": {
+      "type": "object",
+      "properties": {}
+    },
     "CompositePath": {
       "type": "object",
       "properties": {
@@ -2269,6 +2273,44 @@
       ],
       "description": "The object representing continuous mode backup policy."
     },
+    "CorsPolicy": {
+      "type": "object",
+      "properties": {
+        "allowedHeaders": {
+          "type": "string",
+          "description": "The request headers that the origin domain may specify on the CORS request."
+        },
+        "allowedMethods": {
+          "type": "string",
+          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request."
+        },
+        "allowedOrigins": {
+          "type": "string",
+          "description": "The origin domains that are permitted to make a request against the service via CORS."
+        },
+        "exposedHeaders": {
+          "type": "string",
+          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer."
+        },
+        "maxAgeInSeconds": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 1,
+              "maximum": 2147483647
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request."
+        }
+      },
+      "required": [
+        "allowedOrigins"
+      ],
+      "description": "The CORS policy for the Cosmos DB database account."
+    },
     "CreateUpdateOptions": {
       "type": "object",
       "properties": {
@@ -2367,6 +2409,20 @@
           ],
           "description": "The consistency policy for the Cosmos DB database account."
         },
+        "cors": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/CorsPolicy"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The CORS policy for the Cosmos DB database account."
+        },
         "databaseAccountOfferType": {
           "oneOf": [
             {
@@ -4441,7 +4497,7 @@
               "enum": [
                 "SystemAssigned",
                 "UserAssigned",
-                "SystemAssigned, UserAssigned",
+                "SystemAssigned,UserAssigned",
                 "None"
               ]
             },
@@ -4449,7 +4505,22 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The type of identity used for the resource. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the service."
+          "description": "The type of identity used for the resource. The type 'SystemAssigned,UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the service."
+        },
+        "userAssignedIdentities": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/Components1jq1t4ischemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The list of user identities associated with resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
         }
       },
       "description": "Identity for the resource."
diff --git a/schemas/2020-06-01/Microsoft.ContainerService.json b/schemas/2020-06-01/Microsoft.ContainerService.json
index 4d49c97fc7..5e67abe7e6 100644
--- a/schemas/2020-06-01/Microsoft.ContainerService.json
+++ b/schemas/2020-06-01/Microsoft.ContainerService.json
@@ -1718,7 +1718,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "(PREVIEW) Whether to enable Kubernetes Pod security policy."
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
         },
         "enableRBAC": {
           "oneOf": [
diff --git a/schemas/2020-07-01/Microsoft.ContainerService.json b/schemas/2020-07-01/Microsoft.ContainerService.json
new file mode 100644
index 0000000000..b5eceef712
--- /dev/null
+++ b/schemas/2020-07-01/Microsoft.ContainerService.json
@@ -0,0 +1,2085 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2020-07-01/Microsoft.ContainerService.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.ContainerService",
+  "description": "Microsoft ContainerService Resource Types",
+  "resourceDefinitions": {
+    "managedClusters": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-01"
+          ]
+        },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Identity for the managed cluster."
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z0-9]$|^[a-zA-Z0-9][-_a-zA-Z0-9]{0,61}[a-zA-Z0-9]$",
+              "minLength": 1,
+              "maxLength": 63
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the managed cluster resource."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties of the managed cluster."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/managedClusters_agentPools_childResource"
+              },
+              {
+                "$ref": "#/definitions/managedClusters_privateEndpointConnections_childResource"
+              }
+            ]
+          }
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterSKU"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.ContainerService/managedClusters"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.ContainerService/managedClusters"
+    },
+    "managedClusters_agentPools": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the agent pool."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterAgentPoolProfileProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties for the container service agent pool profile."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.ContainerService/managedClusters/agentPools"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.ContainerService/managedClusters/agentPools"
+    },
+    "managedClusters_privateEndpointConnections": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the private endpoint connection."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PrivateEndpointConnectionProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties of a private endpoint connection."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.ContainerService/managedClusters/privateEndpointConnections"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.ContainerService/managedClusters/privateEndpointConnections"
+    }
+  },
+  "definitions": {
+    "AgentPoolUpgradeSettings": {
+      "type": "object",
+      "properties": {
+        "maxSurge": {
+          "type": "string",
+          "description": "Count or percentage of additional nodes to be added during upgrade. If empty uses AKS default"
+        }
+      },
+      "description": "Settings for upgrading an agentpool"
+    },
+    "Components1umhcm8schemasmanagedclusteridentitypropertiesuserassignedidentitiesadditionalproperties": {
+      "type": "object",
+      "properties": {}
+    },
+    "Componentsqit0etschemasmanagedclusterpropertiespropertiesidentityprofileadditionalproperties": {
+      "type": "object",
+      "properties": {
+        "clientId": {
+          "type": "string",
+          "description": "The client id of the user assigned identity."
+        },
+        "objectId": {
+          "type": "string",
+          "description": "The object id of the user assigned identity."
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "The resource id of the user assigned identity."
+        }
+      }
+    },
+    "ContainerServiceLinuxProfile": {
+      "type": "object",
+      "properties": {
+        "adminUsername": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[A-Za-z][-A-Za-z0-9_]*$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The administrator username to use for Linux VMs."
+        },
+        "ssh": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ContainerServiceSshConfiguration"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "SSH configuration for Linux-based VMs running on Azure."
+        }
+      },
+      "required": [
+        "adminUsername",
+        "ssh"
+      ],
+      "description": "Profile for Linux VMs in the container service cluster."
+    },
+    "ContainerServiceNetworkProfile": {
+      "type": "object",
+      "properties": {
+        "dnsServiceIP": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$",
+              "default": "10.0.0.10"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "An IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range specified in serviceCidr."
+        },
+        "dockerBridgeCidr": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$",
+              "default": "172.17.0.1/16"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A CIDR notation IP range assigned to the Docker bridge network. It must not overlap with any Subnet IP ranges or the Kubernetes service address range."
+        },
+        "loadBalancerProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterLoadBalancerProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Profile of the managed cluster load balancer."
+        },
+        "loadBalancerSku": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "standard",
+                "basic"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The load balancer sku for the managed cluster."
+        },
+        "networkMode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "transparent",
+                "bridge"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Network mode used for building Kubernetes network."
+        },
+        "networkPlugin": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "azure",
+                "kubenet"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Network plugin used for building Kubernetes network."
+        },
+        "networkPolicy": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "calico",
+                "azure"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Network policy used for building Kubernetes network."
+        },
+        "outboundType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "loadBalancer",
+                "userDefinedRouting"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The outbound (egress) routing method."
+        },
+        "podCidr": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$",
+              "default": "10.244.0.0/16"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A CIDR notation IP range from which to assign pod IPs when kubenet is used."
+        },
+        "serviceCidr": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$",
+              "default": "10.0.0.0/16"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges."
+        }
+      },
+      "description": "Profile of network configuration."
+    },
+    "ContainerServiceSshConfiguration": {
+      "type": "object",
+      "properties": {
+        "publicKeys": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ContainerServiceSshPublicKey"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The list of SSH public keys used to authenticate with Linux-based VMs. Only expect one key specified."
+        }
+      },
+      "required": [
+        "publicKeys"
+      ],
+      "description": "SSH configuration for Linux-based VMs running on Azure."
+    },
+    "ContainerServiceSshPublicKey": {
+      "type": "object",
+      "properties": {
+        "keyData": {
+          "type": "string",
+          "description": "Certificate public key used to authenticate with VMs through SSH. The certificate must be in PEM format with or without headers."
+        }
+      },
+      "required": [
+        "keyData"
+      ],
+      "description": "Contains information about SSH certificate public key data."
+    },
+    "ManagedClusterAADProfile": {
+      "type": "object",
+      "properties": {
+        "adminGroupObjectIDs": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "AAD group object IDs that will have admin role of the cluster."
+        },
+        "clientAppID": {
+          "type": "string",
+          "description": "The client AAD application ID."
+        },
+        "enableAzureRBAC": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Whether to enable Azure RBAC for Kubernetes authorization."
+        },
+        "managed": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Whether to enable managed AAD."
+        },
+        "serverAppID": {
+          "type": "string",
+          "description": "The server AAD application ID."
+        },
+        "serverAppSecret": {
+          "type": "string",
+          "description": "The server AAD application secret."
+        },
+        "tenantID": {
+          "type": "string",
+          "description": "The AAD tenant ID to use for authentication. If not specified, will use the tenant of the deployment subscription."
+        }
+      },
+      "description": "AADProfile specifies attributes for Azure Active Directory integration."
+    },
+    "ManagedClusterAddonProfile": {
+      "type": "object",
+      "properties": {
+        "config": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Key-value pairs for configuring an add-on."
+        },
+        "enabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Whether the add-on is enabled or not."
+        }
+      },
+      "required": [
+        "enabled"
+      ],
+      "description": "A Kubernetes add-on profile for a managed cluster."
+    },
+    "ManagedClusterAgentPoolProfile": {
+      "type": "object",
+      "properties": {
+        "availabilityZones": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType."
+        },
+        "count": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The default value is 1."
+        },
+        "enableAutoScaling": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Whether to enable auto-scaler"
+        },
+        "enableNodePublicIP": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enable public IP for nodes"
+        },
+        "maxCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum number of nodes for auto-scaling"
+        },
+        "maxPods": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum number of pods that can run on a node."
+        },
+        "minCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Minimum number of nodes for auto-scaling"
+        },
+        "mode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "System",
+                "User"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "AgentPoolMode represents mode of an agent pool."
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-z][a-z0-9]{0,11}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Unique name of the agent pool profile in the context of the subscription and resource group."
+        },
+        "nodeLabels": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Agent pool node labels to be persisted across all nodes in agent pool."
+        },
+        "nodeTaints": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule."
+        },
+        "orchestratorVersion": {
+          "type": "string",
+          "description": "Version of orchestrator specified when creating the managed cluster."
+        },
+        "osDiskSizeGB": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1023
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified."
+        },
+        "osType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Linux",
+                "Windows"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux."
+        },
+        "proximityPlacementGroupID": {
+          "type": "string",
+          "description": "The ID for Proximity Placement Group."
+        },
+        "scaleSetEvictionPolicy": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Delete",
+                "Deallocate"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "ScaleSetEvictionPolicy to be used to specify eviction policy for Spot virtual machine scale set. Default to Delete."
+        },
+        "scaleSetPriority": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Spot",
+                "Regular"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular."
+        },
+        "spotMaxPrice": {
+          "oneOf": [
+            {
+              "type": "number",
+              "default": -1
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "SpotMaxPrice to be used to specify the maximum price you are willing to pay in US Dollars. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Agent pool tags to be persisted on the agent pool virtual machine scale set."
+        },
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "VirtualMachineScaleSets",
+                "AvailabilitySet"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "AgentPoolType represents types of an agent pool."
+        },
+        "upgradeSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AgentPoolUpgradeSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Settings for upgrading an agentpool"
+        },
+        "vmSize": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard_A1",
+                "Standard_A10",
+                "Standard_A11",
+                "Standard_A1_v2",
+                "Standard_A2",
+                "Standard_A2_v2",
+                "Standard_A2m_v2",
+                "Standard_A3",
+                "Standard_A4",
+                "Standard_A4_v2",
+                "Standard_A4m_v2",
+                "Standard_A5",
+                "Standard_A6",
+                "Standard_A7",
+                "Standard_A8",
+                "Standard_A8_v2",
+                "Standard_A8m_v2",
+                "Standard_A9",
+                "Standard_B2ms",
+                "Standard_B2s",
+                "Standard_B4ms",
+                "Standard_B8ms",
+                "Standard_D1",
+                "Standard_D11",
+                "Standard_D11_v2",
+                "Standard_D11_v2_Promo",
+                "Standard_D12",
+                "Standard_D12_v2",
+                "Standard_D12_v2_Promo",
+                "Standard_D13",
+                "Standard_D13_v2",
+                "Standard_D13_v2_Promo",
+                "Standard_D14",
+                "Standard_D14_v2",
+                "Standard_D14_v2_Promo",
+                "Standard_D15_v2",
+                "Standard_D16_v3",
+                "Standard_D16s_v3",
+                "Standard_D1_v2",
+                "Standard_D2",
+                "Standard_D2_v2",
+                "Standard_D2_v2_Promo",
+                "Standard_D2_v3",
+                "Standard_D2s_v3",
+                "Standard_D3",
+                "Standard_D32_v3",
+                "Standard_D32s_v3",
+                "Standard_D3_v2",
+                "Standard_D3_v2_Promo",
+                "Standard_D4",
+                "Standard_D4_v2",
+                "Standard_D4_v2_Promo",
+                "Standard_D4_v3",
+                "Standard_D4s_v3",
+                "Standard_D5_v2",
+                "Standard_D5_v2_Promo",
+                "Standard_D64_v3",
+                "Standard_D64s_v3",
+                "Standard_D8_v3",
+                "Standard_D8s_v3",
+                "Standard_DS1",
+                "Standard_DS11",
+                "Standard_DS11_v2",
+                "Standard_DS11_v2_Promo",
+                "Standard_DS12",
+                "Standard_DS12_v2",
+                "Standard_DS12_v2_Promo",
+                "Standard_DS13",
+                "Standard_DS13-2_v2",
+                "Standard_DS13-4_v2",
+                "Standard_DS13_v2",
+                "Standard_DS13_v2_Promo",
+                "Standard_DS14",
+                "Standard_DS14-4_v2",
+                "Standard_DS14-8_v2",
+                "Standard_DS14_v2",
+                "Standard_DS14_v2_Promo",
+                "Standard_DS15_v2",
+                "Standard_DS1_v2",
+                "Standard_DS2",
+                "Standard_DS2_v2",
+                "Standard_DS2_v2_Promo",
+                "Standard_DS3",
+                "Standard_DS3_v2",
+                "Standard_DS3_v2_Promo",
+                "Standard_DS4",
+                "Standard_DS4_v2",
+                "Standard_DS4_v2_Promo",
+                "Standard_DS5_v2",
+                "Standard_DS5_v2_Promo",
+                "Standard_E16_v3",
+                "Standard_E16s_v3",
+                "Standard_E2_v3",
+                "Standard_E2s_v3",
+                "Standard_E32-16s_v3",
+                "Standard_E32-8s_v3",
+                "Standard_E32_v3",
+                "Standard_E32s_v3",
+                "Standard_E4_v3",
+                "Standard_E4s_v3",
+                "Standard_E64-16s_v3",
+                "Standard_E64-32s_v3",
+                "Standard_E64_v3",
+                "Standard_E64s_v3",
+                "Standard_E8_v3",
+                "Standard_E8s_v3",
+                "Standard_F1",
+                "Standard_F16",
+                "Standard_F16s",
+                "Standard_F16s_v2",
+                "Standard_F1s",
+                "Standard_F2",
+                "Standard_F2s",
+                "Standard_F2s_v2",
+                "Standard_F32s_v2",
+                "Standard_F4",
+                "Standard_F4s",
+                "Standard_F4s_v2",
+                "Standard_F64s_v2",
+                "Standard_F72s_v2",
+                "Standard_F8",
+                "Standard_F8s",
+                "Standard_F8s_v2",
+                "Standard_G1",
+                "Standard_G2",
+                "Standard_G3",
+                "Standard_G4",
+                "Standard_G5",
+                "Standard_GS1",
+                "Standard_GS2",
+                "Standard_GS3",
+                "Standard_GS4",
+                "Standard_GS4-4",
+                "Standard_GS4-8",
+                "Standard_GS5",
+                "Standard_GS5-16",
+                "Standard_GS5-8",
+                "Standard_H16",
+                "Standard_H16m",
+                "Standard_H16mr",
+                "Standard_H16r",
+                "Standard_H8",
+                "Standard_H8m",
+                "Standard_L16s",
+                "Standard_L32s",
+                "Standard_L4s",
+                "Standard_L8s",
+                "Standard_M128-32ms",
+                "Standard_M128-64ms",
+                "Standard_M128ms",
+                "Standard_M128s",
+                "Standard_M64-16ms",
+                "Standard_M64-32ms",
+                "Standard_M64ms",
+                "Standard_M64s",
+                "Standard_NC12",
+                "Standard_NC12s_v2",
+                "Standard_NC12s_v3",
+                "Standard_NC24",
+                "Standard_NC24r",
+                "Standard_NC24rs_v2",
+                "Standard_NC24rs_v3",
+                "Standard_NC24s_v2",
+                "Standard_NC24s_v3",
+                "Standard_NC6",
+                "Standard_NC6s_v2",
+                "Standard_NC6s_v3",
+                "Standard_ND12s",
+                "Standard_ND24rs",
+                "Standard_ND24s",
+                "Standard_ND6s",
+                "Standard_NV12",
+                "Standard_NV24",
+                "Standard_NV6"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Size of agent VMs."
+        },
+        "vnetSubnetID": {
+          "type": "string",
+          "description": "VNet SubnetID specifies the VNet's subnet identifier."
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "Profile for the container service agent pool."
+    },
+    "ManagedClusterAgentPoolProfileProperties": {
+      "type": "object",
+      "properties": {
+        "availabilityZones": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType."
+        },
+        "count": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The default value is 1."
+        },
+        "enableAutoScaling": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Whether to enable auto-scaler"
+        },
+        "enableNodePublicIP": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enable public IP for nodes"
+        },
+        "maxCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum number of nodes for auto-scaling"
+        },
+        "maxPods": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum number of pods that can run on a node."
+        },
+        "minCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Minimum number of nodes for auto-scaling"
+        },
+        "mode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "System",
+                "User"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "AgentPoolMode represents mode of an agent pool."
+        },
+        "nodeLabels": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Agent pool node labels to be persisted across all nodes in agent pool."
+        },
+        "nodeTaints": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule."
+        },
+        "orchestratorVersion": {
+          "type": "string",
+          "description": "Version of orchestrator specified when creating the managed cluster."
+        },
+        "osDiskSizeGB": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1023
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified."
+        },
+        "osType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Linux",
+                "Windows"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux."
+        },
+        "proximityPlacementGroupID": {
+          "type": "string",
+          "description": "The ID for Proximity Placement Group."
+        },
+        "scaleSetEvictionPolicy": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Delete",
+                "Deallocate"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "ScaleSetEvictionPolicy to be used to specify eviction policy for Spot virtual machine scale set. Default to Delete."
+        },
+        "scaleSetPriority": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Spot",
+                "Regular"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular."
+        },
+        "spotMaxPrice": {
+          "oneOf": [
+            {
+              "type": "number",
+              "default": -1
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "SpotMaxPrice to be used to specify the maximum price you are willing to pay in US Dollars. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Agent pool tags to be persisted on the agent pool virtual machine scale set."
+        },
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "VirtualMachineScaleSets",
+                "AvailabilitySet"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "AgentPoolType represents types of an agent pool."
+        },
+        "upgradeSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AgentPoolUpgradeSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Settings for upgrading an agentpool"
+        },
+        "vmSize": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard_A1",
+                "Standard_A10",
+                "Standard_A11",
+                "Standard_A1_v2",
+                "Standard_A2",
+                "Standard_A2_v2",
+                "Standard_A2m_v2",
+                "Standard_A3",
+                "Standard_A4",
+                "Standard_A4_v2",
+                "Standard_A4m_v2",
+                "Standard_A5",
+                "Standard_A6",
+                "Standard_A7",
+                "Standard_A8",
+                "Standard_A8_v2",
+                "Standard_A8m_v2",
+                "Standard_A9",
+                "Standard_B2ms",
+                "Standard_B2s",
+                "Standard_B4ms",
+                "Standard_B8ms",
+                "Standard_D1",
+                "Standard_D11",
+                "Standard_D11_v2",
+                "Standard_D11_v2_Promo",
+                "Standard_D12",
+                "Standard_D12_v2",
+                "Standard_D12_v2_Promo",
+                "Standard_D13",
+                "Standard_D13_v2",
+                "Standard_D13_v2_Promo",
+                "Standard_D14",
+                "Standard_D14_v2",
+                "Standard_D14_v2_Promo",
+                "Standard_D15_v2",
+                "Standard_D16_v3",
+                "Standard_D16s_v3",
+                "Standard_D1_v2",
+                "Standard_D2",
+                "Standard_D2_v2",
+                "Standard_D2_v2_Promo",
+                "Standard_D2_v3",
+                "Standard_D2s_v3",
+                "Standard_D3",
+                "Standard_D32_v3",
+                "Standard_D32s_v3",
+                "Standard_D3_v2",
+                "Standard_D3_v2_Promo",
+                "Standard_D4",
+                "Standard_D4_v2",
+                "Standard_D4_v2_Promo",
+                "Standard_D4_v3",
+                "Standard_D4s_v3",
+                "Standard_D5_v2",
+                "Standard_D5_v2_Promo",
+                "Standard_D64_v3",
+                "Standard_D64s_v3",
+                "Standard_D8_v3",
+                "Standard_D8s_v3",
+                "Standard_DS1",
+                "Standard_DS11",
+                "Standard_DS11_v2",
+                "Standard_DS11_v2_Promo",
+                "Standard_DS12",
+                "Standard_DS12_v2",
+                "Standard_DS12_v2_Promo",
+                "Standard_DS13",
+                "Standard_DS13-2_v2",
+                "Standard_DS13-4_v2",
+                "Standard_DS13_v2",
+                "Standard_DS13_v2_Promo",
+                "Standard_DS14",
+                "Standard_DS14-4_v2",
+                "Standard_DS14-8_v2",
+                "Standard_DS14_v2",
+                "Standard_DS14_v2_Promo",
+                "Standard_DS15_v2",
+                "Standard_DS1_v2",
+                "Standard_DS2",
+                "Standard_DS2_v2",
+                "Standard_DS2_v2_Promo",
+                "Standard_DS3",
+                "Standard_DS3_v2",
+                "Standard_DS3_v2_Promo",
+                "Standard_DS4",
+                "Standard_DS4_v2",
+                "Standard_DS4_v2_Promo",
+                "Standard_DS5_v2",
+                "Standard_DS5_v2_Promo",
+                "Standard_E16_v3",
+                "Standard_E16s_v3",
+                "Standard_E2_v3",
+                "Standard_E2s_v3",
+                "Standard_E32-16s_v3",
+                "Standard_E32-8s_v3",
+                "Standard_E32_v3",
+                "Standard_E32s_v3",
+                "Standard_E4_v3",
+                "Standard_E4s_v3",
+                "Standard_E64-16s_v3",
+                "Standard_E64-32s_v3",
+                "Standard_E64_v3",
+                "Standard_E64s_v3",
+                "Standard_E8_v3",
+                "Standard_E8s_v3",
+                "Standard_F1",
+                "Standard_F16",
+                "Standard_F16s",
+                "Standard_F16s_v2",
+                "Standard_F1s",
+                "Standard_F2",
+                "Standard_F2s",
+                "Standard_F2s_v2",
+                "Standard_F32s_v2",
+                "Standard_F4",
+                "Standard_F4s",
+                "Standard_F4s_v2",
+                "Standard_F64s_v2",
+                "Standard_F72s_v2",
+                "Standard_F8",
+                "Standard_F8s",
+                "Standard_F8s_v2",
+                "Standard_G1",
+                "Standard_G2",
+                "Standard_G3",
+                "Standard_G4",
+                "Standard_G5",
+                "Standard_GS1",
+                "Standard_GS2",
+                "Standard_GS3",
+                "Standard_GS4",
+                "Standard_GS4-4",
+                "Standard_GS4-8",
+                "Standard_GS5",
+                "Standard_GS5-16",
+                "Standard_GS5-8",
+                "Standard_H16",
+                "Standard_H16m",
+                "Standard_H16mr",
+                "Standard_H16r",
+                "Standard_H8",
+                "Standard_H8m",
+                "Standard_L16s",
+                "Standard_L32s",
+                "Standard_L4s",
+                "Standard_L8s",
+                "Standard_M128-32ms",
+                "Standard_M128-64ms",
+                "Standard_M128ms",
+                "Standard_M128s",
+                "Standard_M64-16ms",
+                "Standard_M64-32ms",
+                "Standard_M64ms",
+                "Standard_M64s",
+                "Standard_NC12",
+                "Standard_NC12s_v2",
+                "Standard_NC12s_v3",
+                "Standard_NC24",
+                "Standard_NC24r",
+                "Standard_NC24rs_v2",
+                "Standard_NC24rs_v3",
+                "Standard_NC24s_v2",
+                "Standard_NC24s_v3",
+                "Standard_NC6",
+                "Standard_NC6s_v2",
+                "Standard_NC6s_v3",
+                "Standard_ND12s",
+                "Standard_ND24rs",
+                "Standard_ND24s",
+                "Standard_ND6s",
+                "Standard_NV12",
+                "Standard_NV24",
+                "Standard_NV6"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Size of agent VMs."
+        },
+        "vnetSubnetID": {
+          "type": "string",
+          "description": "VNet SubnetID specifies the VNet's subnet identifier."
+        }
+      },
+      "description": "Properties for the container service agent pool profile."
+    },
+    "ManagedClusterAPIServerAccessProfile": {
+      "type": "object",
+      "properties": {
+        "authorizedIPRanges": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Authorized IP Ranges to kubernetes API server."
+        },
+        "enablePrivateCluster": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Whether to create the cluster as a private cluster or not."
+        }
+      },
+      "description": "Access profile for managed cluster API server."
+    },
+    "ManagedClusterIdentity": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "SystemAssigned",
+                "UserAssigned",
+                "None"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of identity used for the managed cluster. Type 'SystemAssigned' will use an implicitly created identity in master components and an auto-created user assigned identity in MC_ resource group in agent nodes. Type 'None' will not use MSI for the managed cluster, service principal will be used instead."
+        },
+        "userAssignedIdentities": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/Components1umhcm8schemasmanagedclusteridentitypropertiesuserassignedidentitiesadditionalproperties"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The user identity associated with the managed cluster. This identity will be used in control plane and only one user assigned identity is allowed. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
+        }
+      },
+      "description": "Identity for the managed cluster."
+    },
+    "ManagedClusterLoadBalancerProfile": {
+      "type": "object",
+      "properties": {
+        "allocatedOutboundPorts": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 64000,
+              "default": "0"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Desired number of allocated SNAT ports per VM. Allowed values must be in the range of 0 to 64000 (inclusive). The default value is 0 which results in Azure dynamically allocating ports."
+        },
+        "effectiveOutboundIPs": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ResourceReference"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The effective outbound IP resources of the cluster load balancer."
+        },
+        "idleTimeoutInMinutes": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 4,
+              "maximum": 120,
+              "default": "30"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Desired outbound flow idle timeout in minutes. Allowed values must be in the range of 4 to 120 (inclusive). The default value is 30 minutes."
+        },
+        "managedOutboundIPs": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterLoadBalancerProfileManagedOutboundIPs"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Desired managed outbound IPs for the cluster load balancer."
+        },
+        "outboundIPPrefixes": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterLoadBalancerProfileOutboundIPPrefixes"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Desired outbound IP Prefix resources for the cluster load balancer."
+        },
+        "outboundIPs": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterLoadBalancerProfileOutboundIPs"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Desired outbound IP resources for the cluster load balancer."
+        }
+      },
+      "description": "Profile of the managed cluster load balancer."
+    },
+    "ManagedClusterLoadBalancerProfileManagedOutboundIPs": {
+      "type": "object",
+      "properties": {
+        "count": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 1,
+              "maximum": 100,
+              "default": "1"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Desired number of outbound IP created/managed by Azure for the cluster load balancer. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. "
+        }
+      },
+      "description": "Desired managed outbound IPs for the cluster load balancer."
+    },
+    "ManagedClusterLoadBalancerProfileOutboundIPPrefixes": {
+      "type": "object",
+      "properties": {
+        "publicIPPrefixes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ResourceReference"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A list of public IP prefix resources."
+        }
+      },
+      "description": "Desired outbound IP Prefix resources for the cluster load balancer."
+    },
+    "ManagedClusterLoadBalancerProfileOutboundIPs": {
+      "type": "object",
+      "properties": {
+        "publicIPs": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ResourceReference"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A list of public IP resources."
+        }
+      },
+      "description": "Desired outbound IP resources for the cluster load balancer."
+    },
+    "ManagedClusterProperties": {
+      "type": "object",
+      "properties": {
+        "aadProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterAADProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "AADProfile specifies attributes for Azure Active Directory integration."
+        },
+        "addonProfiles": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/ManagedClusterAddonProfile"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Profile of managed cluster add-on."
+        },
+        "agentPoolProfiles": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ManagedClusterAgentPoolProfile"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties of the agent pool."
+        },
+        "apiServerAccessProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterAPIServerAccessProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Access profile for managed cluster API server."
+        },
+        "autoScalerProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterPropertiesAutoScalerProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Parameters to be applied to the cluster-autoscaler when enabled"
+        },
+        "diskEncryptionSetID": {
+          "type": "string",
+          "description": "ResourceId of the disk encryption set to use for enabling encryption at rest."
+        },
+        "dnsPrefix": {
+          "type": "string",
+          "description": "DNS prefix specified when creating the managed cluster."
+        },
+        "enablePodSecurityPolicy": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "(DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy."
+        },
+        "enableRBAC": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Whether to enable Kubernetes Role-Based Access Control."
+        },
+        "identityProfile": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/Componentsqit0etschemasmanagedclusterpropertiespropertiesidentityprofileadditionalproperties"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Identities associated with the cluster."
+        },
+        "kubernetesVersion": {
+          "type": "string",
+          "description": "Version of Kubernetes specified when creating the managed cluster."
+        },
+        "linuxProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ContainerServiceLinuxProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Profile for Linux VMs in the container service cluster."
+        },
+        "networkProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ContainerServiceNetworkProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Profile of network configuration."
+        },
+        "nodeResourceGroup": {
+          "type": "string",
+          "description": "Name of the resource group containing agent pool nodes."
+        },
+        "servicePrincipalProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterServicePrincipalProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs."
+        },
+        "windowsProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterWindowsProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Profile for Windows VMs in the container service cluster."
+        }
+      },
+      "description": "Properties of the managed cluster."
+    },
+    "ManagedClusterPropertiesAutoScalerProfile": {
+      "type": "object",
+      "properties": {
+        "balance-similar-node-groups": {
+          "type": "string"
+        },
+        "max-graceful-termination-sec": {
+          "type": "string"
+        },
+        "scale-down-delay-after-add": {
+          "type": "string"
+        },
+        "scale-down-delay-after-delete": {
+          "type": "string"
+        },
+        "scale-down-delay-after-failure": {
+          "type": "string"
+        },
+        "scale-down-unneeded-time": {
+          "type": "string"
+        },
+        "scale-down-unready-time": {
+          "type": "string"
+        },
+        "scale-down-utilization-threshold": {
+          "type": "string"
+        },
+        "scan-interval": {
+          "type": "string"
+        }
+      },
+      "description": "Parameters to be applied to the cluster-autoscaler when enabled"
+    },
+    "ManagedClusterServicePrincipalProfile": {
+      "type": "object",
+      "properties": {
+        "clientId": {
+          "type": "string",
+          "description": "The ID for the service principal."
+        },
+        "secret": {
+          "type": "string",
+          "description": "The secret password associated with the service principal in plain text."
+        }
+      },
+      "required": [
+        "clientId"
+      ],
+      "description": "Information about a service principal identity for the cluster to use for manipulating Azure APIs."
+    },
+    "ManagedClusterSKU": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Basic"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Name of a managed cluster SKU."
+        },
+        "tier": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Paid",
+                "Free"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tier of a managed cluster SKU."
+        }
+      }
+    },
+    "managedClusters_agentPools_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the agent pool."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedClusterAgentPoolProfileProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties for the container service agent pool profile."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "agentPools"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.ContainerService/managedClusters/agentPools"
+    },
+    "managedClusters_privateEndpointConnections_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the private endpoint connection."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PrivateEndpointConnectionProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties of a private endpoint connection."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "privateEndpointConnections"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.ContainerService/managedClusters/privateEndpointConnections"
+    },
+    "ManagedClusterWindowsProfile": {
+      "type": "object",
+      "properties": {
+        "adminPassword": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The administrator password to use for Windows VMs."
+        },
+        "adminUsername": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The administrator username to use for Windows VMs."
+        },
+        "licenseType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "None",
+                "Windows_Server"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The licenseType to use for Windows VMs. Windows_Server is used to enable Azure Hybrid User Benefits for Windows VMs."
+        }
+      },
+      "required": [
+        "adminUsername"
+      ],
+      "description": "Profile for Windows VMs in the container service cluster."
+    },
+    "PrivateEndpoint": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "The resource Id for private endpoint"
+        }
+      },
+      "description": "Private endpoint which a connection belongs to."
+    },
+    "PrivateEndpointConnectionProperties": {
+      "type": "object",
+      "properties": {
+        "privateEndpoint": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PrivateEndpoint"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Private endpoint which a connection belongs to."
+        },
+        "privateLinkServiceConnectionState": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PrivateLinkServiceConnectionState"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The state of a private link service connection."
+        }
+      },
+      "required": [
+        "privateLinkServiceConnectionState"
+      ],
+      "description": "Properties of a private endpoint connection."
+    },
+    "PrivateLinkServiceConnectionState": {
+      "type": "object",
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "The private link service connection description."
+        },
+        "status": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Pending",
+                "Approved",
+                "Rejected",
+                "Disconnected"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The private link service connection status."
+        }
+      },
+      "description": "The state of a private link service connection."
+    },
+    "ResourceReference": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "The fully qualified Azure resource id."
+        }
+      },
+      "description": "A reference to an Azure resource."
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/2020-07-07/Microsoft.OffAzure.json b/schemas/2020-07-07/Microsoft.OffAzure.json
new file mode 100644
index 0000000000..6b8a3894f0
--- /dev/null
+++ b/schemas/2020-07-07/Microsoft.OffAzure.json
@@ -0,0 +1,611 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2020-07-07/Microsoft.OffAzure.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.OffAzure",
+  "description": "Microsoft OffAzure Resource Types",
+  "resourceDefinitions": {
+    "HyperVSites": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-07"
+          ]
+        },
+        "eTag": {
+          "type": "string",
+          "description": "eTag for concurrency control."
+        },
+        "location": {
+          "type": "string",
+          "description": "Azure location in which Sites is created."
+        },
+        "name": {
+          "type": "string",
+          "description": "Site name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SiteProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for site properties."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/HyperVSites_clusters_childResource"
+              },
+              {
+                "$ref": "#/definitions/HyperVSites_hosts_childResource"
+              }
+            ]
+          }
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OffAzure/HyperVSites"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OffAzure/HyperVSites"
+    },
+    "HyperVSites_clusters": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-07"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Cluster ARM name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HyperVClusterProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for cluster properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OffAzure/HyperVSites/clusters"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OffAzure/HyperVSites/clusters"
+    },
+    "HyperVSites_hosts": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-07"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Host ARM name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HyperVHostProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for host properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OffAzure/HyperVSites/hosts"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OffAzure/HyperVSites/hosts"
+    },
+    "MasterSites": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-07"
+          ]
+        },
+        "eTag": {
+          "type": "string",
+          "description": "eTag for concurrency control."
+        },
+        "location": {
+          "type": "string",
+          "description": "Azure location in which Sites is created."
+        },
+        "name": {
+          "type": "string",
+          "description": "Site name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MasterSiteProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for site properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OffAzure/MasterSites"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OffAzure/MasterSites"
+    },
+    "VMwareSites": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-07"
+          ]
+        },
+        "eTag": {
+          "type": "string",
+          "description": "eTag for concurrency control."
+        },
+        "location": {
+          "type": "string",
+          "description": "Azure location in which Sites is created."
+        },
+        "name": {
+          "type": "string",
+          "description": "Site name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SiteProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for site properties."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/VMwareSites_vCenters_childResource"
+              }
+            ]
+          }
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OffAzure/VMwareSites"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OffAzure/VMwareSites"
+    },
+    "VMwareSites_vCenters": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-07"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "VCenter ARM name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VCenterProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for vCenter properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OffAzure/VMwareSites/vCenters"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OffAzure/VMwareSites/vCenters"
+    }
+  },
+  "definitions": {
+    "HyperVClusterProperties": {
+      "type": "object",
+      "properties": {
+        "fqdn": {
+          "type": "string",
+          "description": "FQDN/IPAddress of the Hyper-V cluster."
+        },
+        "hostFqdnList": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "List of hosts (FQDN) currently being tracked by the cluster."
+        },
+        "runAsAccountId": {
+          "type": "string",
+          "description": "Run as account ID of the Hyper-V cluster."
+        }
+      },
+      "description": "Class for cluster properties."
+    },
+    "HyperVHostProperties": {
+      "type": "object",
+      "properties": {
+        "fqdn": {
+          "type": "string",
+          "description": "FQDN/IPAddress of the Hyper-V host."
+        },
+        "runAsAccountId": {
+          "type": "string",
+          "description": "Run as account ID of the Hyper-V host."
+        }
+      },
+      "description": "Class for host properties."
+    },
+    "HyperVSites_clusters_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-07"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Cluster ARM name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HyperVClusterProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for cluster properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "clusters"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OffAzure/HyperVSites/clusters"
+    },
+    "HyperVSites_hosts_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-07"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Host ARM name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HyperVHostProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for host properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "hosts"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OffAzure/HyperVSites/hosts"
+    },
+    "MasterSiteProperties": {
+      "type": "object",
+      "properties": {
+        "allowMultipleSites": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Value indicating whether multiple sites per site type are allowed."
+        },
+        "publicNetworkAccess": {
+          "type": "string",
+          "description": "State of public network access."
+        },
+        "sites": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "List of sites that are a part of Master Site."
+        }
+      },
+      "description": "Class for site properties."
+    },
+    "SiteAgentProperties": {
+      "type": "object",
+      "properties": {
+        "keyVaultId": {
+          "type": "string",
+          "description": "Key vault ARM Id."
+        },
+        "keyVaultUri": {
+          "type": "string",
+          "description": "Key vault URI."
+        }
+      },
+      "description": "Class for site agent properties."
+    },
+    "SiteProperties": {
+      "type": "object",
+      "properties": {
+        "agentDetails": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SiteAgentProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for site agent properties."
+        },
+        "applianceName": {
+          "type": "string",
+          "description": "Appliance Name."
+        },
+        "discoverySolutionId": {
+          "type": "string",
+          "description": "ARM ID of migration hub solution for SDS."
+        },
+        "servicePrincipalIdentityDetails": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SiteSpnProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for site properties."
+        }
+      },
+      "description": "Class for site properties."
+    },
+    "SiteSpnProperties": {
+      "type": "object",
+      "properties": {
+        "aadAuthority": {
+          "type": "string",
+          "description": "AAD Authority URL which was used to request the token for the service principal."
+        },
+        "applicationId": {
+          "type": "string",
+          "description": "Application/client Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services."
+        },
+        "audience": {
+          "type": "string",
+          "description": "Intended audience for the service principal."
+        },
+        "objectId": {
+          "type": "string",
+          "description": "Object Id of the service principal with which the on-premise management/data plane components would communicate with our Azure services."
+        },
+        "rawCertData": {
+          "type": "string",
+          "description": "Raw certificate data for building certificate expiry flows."
+        },
+        "tenantId": {
+          "type": "string",
+          "description": "Tenant Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services."
+        }
+      },
+      "description": "Class for site properties."
+    },
+    "VCenterProperties": {
+      "type": "object",
+      "properties": {
+        "fqdn": {
+          "type": "string",
+          "description": "FQDN/IPAddress of the vCenter."
+        },
+        "port": {
+          "type": "string",
+          "description": "Port of the vCenter."
+        },
+        "runAsAccountId": {
+          "type": "string",
+          "description": "Run as account ID of the vCenter."
+        }
+      },
+      "description": "Class for vCenter properties."
+    },
+    "VMwareSites_vCenters_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-07"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "VCenter ARM name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VCenterProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Class for vCenter properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "vCenters"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OffAzure/VMwareSites/vCenters"
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/2020-08-01/Microsoft.OperationalInsights.json b/schemas/2020-08-01/Microsoft.OperationalInsights.json
new file mode 100644
index 0000000000..debb8c0206
--- /dev/null
+++ b/schemas/2020-08-01/Microsoft.OperationalInsights.json
@@ -0,0 +1,1441 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.OperationalInsights.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.OperationalInsights",
+  "description": "Microsoft OperationalInsights Resource Types",
+  "resourceDefinitions": {
+    "clusters": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Identity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Identity for the resource."
+        },
+        "location": {
+          "type": "string",
+          "description": "The geo-location where the resource lives"
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[A-Za-z0-9][A-Za-z0-9-]+[A-Za-z0-9]$",
+              "minLength": 4,
+              "maxLength": 63
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the Log Analytics cluster."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ClusterProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Cluster properties."
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ClusterSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The cluster sku definition."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OperationalInsights/clusters"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/clusters"
+    },
+    "workspaces": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "eTag": {
+          "type": "string",
+          "description": "The ETag of the workspace."
+        },
+        "location": {
+          "type": "string",
+          "description": "The geo-location where the resource lives"
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[A-Za-z0-9][A-Za-z0-9-]+[A-Za-z0-9]$",
+              "minLength": 4,
+              "maxLength": 63
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the workspace."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WorkspacePropertiesModel"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Workspace properties."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/workspaces_dataExports_childResource"
+              },
+              {
+                "$ref": "#/definitions/workspaces_dataSources_childResource"
+              },
+              {
+                "$ref": "#/definitions/workspaces_linkedServices_childResource"
+              },
+              {
+                "$ref": "#/definitions/workspaces_linkedStorageAccounts_childResource"
+              },
+              {
+                "$ref": "#/definitions/workspaces_storageInsightConfigs_childResource"
+              },
+              {
+                "$ref": "#/definitions/workspaces_savedSearches_childResource"
+              }
+            ]
+          }
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OperationalInsights/workspaces"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces"
+    },
+    "workspaces_dataExports": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[A-Za-z][A-Za-z0-9-]+[A-Za-z0-9]$",
+              "minLength": 4,
+              "maxLength": 63
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The data export rule name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DataExportProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Data Export properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OperationalInsights/workspaces/dataExports"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/dataExports"
+    },
+    "workspaces_dataSources": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "The ETag of the data source."
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "WindowsEvent",
+                "WindowsPerformanceCounter",
+                "IISLogs",
+                "LinuxSyslog",
+                "LinuxSyslogCollection",
+                "LinuxPerformanceObject",
+                "LinuxPerformanceCollection",
+                "CustomLog",
+                "CustomLogCollection",
+                "AzureAuditLog",
+                "AzureActivityLog",
+                "GenericDataSource",
+                "ChangeTrackingCustomPath",
+                "ChangeTrackingPath",
+                "ChangeTrackingServices",
+                "ChangeTrackingDataTypeConfiguration",
+                "ChangeTrackingDefaultRegistry",
+                "ChangeTrackingRegistry",
+                "ChangeTrackingLinuxPath",
+                "LinuxChangeTrackingPath",
+                "ChangeTrackingContentLocation",
+                "WindowsTelemetry",
+                "Office365",
+                "SecurityWindowsBaselineConfiguration",
+                "SecurityCenterSecurityWindowsBaselineConfiguration",
+                "SecurityEventCollectionConfiguration",
+                "SecurityInsightsSecurityEventCollectionConfiguration",
+                "ImportComputerGroup",
+                "NetworkMonitoring",
+                "Itsm",
+                "DnsAnalytics",
+                "ApplicationInsights",
+                "SqlDataClassification"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the datasource resource."
+        },
+        "properties": {
+          "type": "object",
+          "properties": {},
+          "description": "JSON object"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OperationalInsights/workspaces/dataSources"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "kind",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/dataSources"
+    },
+    "workspaces_linkedServices": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the linkedServices resource"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LinkedServiceProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Linked service properties."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OperationalInsights/workspaces/linkedServices"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/linkedServices"
+    },
+    "workspaces_linkedStorageAccounts": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "CustomLogs",
+                "AzureWatson",
+                "Query",
+                "Ingestion",
+                "Alerts"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Linked storage accounts type."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LinkedStorageAccountsPropertiesModel"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Linked storage accounts properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OperationalInsights/workspaces/linkedStorageAccounts"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/linkedStorageAccounts"
+    },
+    "workspaces_savedSearches": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "The ETag of the saved search."
+        },
+        "name": {
+          "type": "string",
+          "description": "The id of the saved search."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SavedSearchProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Value object for saved search results."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OperationalInsights/workspaces/savedSearches"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/savedSearches"
+    },
+    "workspaces_storageInsightConfigs": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "eTag": {
+          "type": "string",
+          "description": "The ETag of the storage insight."
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the storageInsightsConfigs resource"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/StorageInsightProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Storage insight properties."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.OperationalInsights/workspaces/storageInsightConfigs"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/storageInsightConfigs"
+    }
+  },
+  "definitions": {
+    "ClusterProperties": {
+      "type": "object",
+      "properties": {
+        "keyVaultProperties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/KeyVaultProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The key vault properties."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "The link used to get the next page of recommendations."
+        }
+      },
+      "description": "Cluster properties."
+    },
+    "ClusterSku": {
+      "type": "object",
+      "properties": {
+        "capacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The capacity value"
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "CapacityReservation"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the SKU."
+        }
+      },
+      "description": "The cluster sku definition."
+    },
+    "DataExportProperties": {
+      "type": "object",
+      "properties": {
+        "allTables": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "When ‘true’, all workspace's tables are exported."
+        },
+        "createdDate": {
+          "type": "string",
+          "description": "The latest data export rule modification time."
+        },
+        "dataExportId": {
+          "type": "string",
+          "description": "The data export rule ID."
+        },
+        "destination": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Destination"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Destination properties."
+        },
+        "enable": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Active when enabled."
+        },
+        "lastModifiedDate": {
+          "type": "string",
+          "description": "Date and time when the export was last modified."
+        },
+        "tableNames": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "An array of tables to export, for example: [“Heartbeat, SecurityEvent”]."
+        }
+      },
+      "description": "Data Export properties."
+    },
+    "Destination": {
+      "type": "object",
+      "properties": {
+        "metaData": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DestinationMetaData"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Destination meta data."
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "The destination resource ID. This can be copied from the Properties entry of the destination resource in Azure."
+        }
+      },
+      "required": [
+        "resourceId"
+      ],
+      "description": "Destination properties."
+    },
+    "DestinationMetaData": {
+      "type": "object",
+      "properties": {
+        "eventHubName": {
+          "type": "string",
+          "description": "Optional. Allows to define an Event Hub name. Not applicable when destination is Storage Account."
+        }
+      },
+      "description": "Destination meta data."
+    },
+    "Identity": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "SystemAssigned",
+                "None"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The identity type."
+        }
+      },
+      "required": [
+        "type"
+      ],
+      "description": "Identity for the resource."
+    },
+    "KeyVaultProperties": {
+      "type": "object",
+      "properties": {
+        "keyName": {
+          "type": "string",
+          "description": "The name of the key associated with the Log Analytics cluster."
+        },
+        "keyVaultUri": {
+          "type": "string",
+          "description": "The Key Vault uri which holds they key associated with the Log Analytics cluster."
+        },
+        "keyVersion": {
+          "type": "string",
+          "description": "The version of the key associated with the Log Analytics cluster."
+        }
+      },
+      "description": "The key vault properties."
+    },
+    "LinkedServiceProperties": {
+      "type": "object",
+      "properties": {
+        "provisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Succeeded",
+                "Deleting",
+                "ProvisioningAccount",
+                "Updating"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The provisioning state of the linked service."
+        },
+        "resourceId": {
+          "type": "string",
+          "description": "The resource id of the resource that will be linked to the workspace. This should be used for linking resources which require read access"
+        },
+        "writeAccessResourceId": {
+          "type": "string",
+          "description": "The resource id of the resource that will be linked to the workspace. This should be used for linking resources which require write access"
+        }
+      },
+      "description": "Linked service properties."
+    },
+    "LinkedStorageAccountsPropertiesModel": {
+      "type": "object",
+      "properties": {
+        "storageAccountIds": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Linked storage accounts resources ids."
+        }
+      },
+      "description": "Linked storage accounts properties."
+    },
+    "SavedSearchProperties": {
+      "type": "object",
+      "properties": {
+        "category": {
+          "type": "string",
+          "description": "The category of the saved search. This helps the user to find a saved search faster. "
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Saved search display name."
+        },
+        "functionAlias": {
+          "type": "string",
+          "description": "The function alias if query serves as a function."
+        },
+        "functionParameters": {
+          "type": "string",
+          "description": "The optional function parameters if query serves as a function. Value should be in the following format: 'param-name1:type1 = default_value1, param-name2:type2 = default_value2'. For more examples and proper syntax please refer to https://docs.microsoft.com/en-us/azure/kusto/query/functions/user-defined-functions."
+        },
+        "query": {
+          "type": "string",
+          "description": "The query expression for the saved search."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Tag"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The tags attached to the saved search."
+        },
+        "version": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The version number of the query language. The current version is 2 and is the default."
+        }
+      },
+      "required": [
+        "category",
+        "displayName",
+        "query"
+      ],
+      "description": "Value object for saved search results."
+    },
+    "StorageAccount": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "The Azure Resource Manager ID of the storage account resource."
+        },
+        "key": {
+          "type": "string",
+          "description": "The storage account key."
+        }
+      },
+      "required": [
+        "id",
+        "key"
+      ],
+      "description": "Describes a storage account connection."
+    },
+    "StorageInsightProperties": {
+      "type": "object",
+      "properties": {
+        "containers": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The names of the blob containers that the workspace should read"
+        },
+        "storageAccount": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/StorageAccount"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Describes a storage account connection."
+        },
+        "tables": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The names of the Azure tables that the workspace should read"
+        }
+      },
+      "required": [
+        "storageAccount"
+      ],
+      "description": "Storage insight properties."
+    },
+    "Tag": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The tag name."
+        },
+        "value": {
+          "type": "string",
+          "description": "The tag value."
+        }
+      },
+      "required": [
+        "name",
+        "value"
+      ],
+      "description": "A tag of a saved search."
+    },
+    "WorkspaceCapping": {
+      "type": "object",
+      "properties": {
+        "dailyQuotaGb": {
+          "oneOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The workspace daily quota for ingestion."
+        }
+      },
+      "description": "The daily volume cap for ingestion."
+    },
+    "WorkspacePropertiesModel": {
+      "type": "object",
+      "properties": {
+        "provisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Creating",
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "Deleting",
+                "ProvisioningAccount",
+                "Updating"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The provisioning state of the workspace."
+        },
+        "publicNetworkAccessForIngestion": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The network access type for accessing Log Analytics ingestion."
+        },
+        "publicNetworkAccessForQuery": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The network access type for accessing Log Analytics query."
+        },
+        "retentionInDays": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 30,
+              "maximum": 730
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The workspace data retention in days, between 30 and 730."
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WorkspaceSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The SKU (tier) of a workspace."
+        },
+        "workspaceCapping": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WorkspaceCapping"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The daily volume cap for ingestion."
+        }
+      },
+      "description": "Workspace properties."
+    },
+    "WorkspaceSku": {
+      "type": "object",
+      "properties": {
+        "capacityReservationLevel": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The capacity reservation level for this workspace, when CapacityReservation sku is selected."
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Free",
+                "Standard",
+                "Premium",
+                "PerNode",
+                "PerGB2018",
+                "Standalone",
+                "CapacityReservation"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the SKU."
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "The SKU (tier) of a workspace."
+    },
+    "workspaces_dataExports_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[A-Za-z][A-Za-z0-9-]+[A-Za-z0-9]$",
+              "minLength": 4,
+              "maxLength": 63
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The data export rule name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DataExportProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Data Export properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "dataExports"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/dataExports"
+    },
+    "workspaces_dataSources_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "The ETag of the data source."
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "WindowsEvent",
+                "WindowsPerformanceCounter",
+                "IISLogs",
+                "LinuxSyslog",
+                "LinuxSyslogCollection",
+                "LinuxPerformanceObject",
+                "LinuxPerformanceCollection",
+                "CustomLog",
+                "CustomLogCollection",
+                "AzureAuditLog",
+                "AzureActivityLog",
+                "GenericDataSource",
+                "ChangeTrackingCustomPath",
+                "ChangeTrackingPath",
+                "ChangeTrackingServices",
+                "ChangeTrackingDataTypeConfiguration",
+                "ChangeTrackingDefaultRegistry",
+                "ChangeTrackingRegistry",
+                "ChangeTrackingLinuxPath",
+                "LinuxChangeTrackingPath",
+                "ChangeTrackingContentLocation",
+                "WindowsTelemetry",
+                "Office365",
+                "SecurityWindowsBaselineConfiguration",
+                "SecurityCenterSecurityWindowsBaselineConfiguration",
+                "SecurityEventCollectionConfiguration",
+                "SecurityInsightsSecurityEventCollectionConfiguration",
+                "ImportComputerGroup",
+                "NetworkMonitoring",
+                "Itsm",
+                "DnsAnalytics",
+                "ApplicationInsights",
+                "SqlDataClassification"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the datasource resource."
+        },
+        "properties": {
+          "type": "object",
+          "properties": {},
+          "description": "JSON object"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "dataSources"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "kind",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/dataSources"
+    },
+    "workspaces_linkedServices_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the linkedServices resource"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LinkedServiceProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Linked service properties."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "linkedServices"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/linkedServices"
+    },
+    "workspaces_linkedStorageAccounts_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "CustomLogs",
+                "AzureWatson",
+                "Query",
+                "Ingestion",
+                "Alerts"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Linked storage accounts type."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LinkedStorageAccountsPropertiesModel"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Linked storage accounts properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "linkedStorageAccounts"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/linkedStorageAccounts"
+    },
+    "workspaces_savedSearches_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "The ETag of the saved search."
+        },
+        "name": {
+          "type": "string",
+          "description": "The id of the saved search."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SavedSearchProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Value object for saved search results."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "savedSearches"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/savedSearches"
+    },
+    "workspaces_storageInsightConfigs_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-01"
+          ]
+        },
+        "eTag": {
+          "type": "string",
+          "description": "The ETag of the storage insight."
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the storageInsightsConfigs resource"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/StorageInsightProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Storage insight properties."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "storageInsightConfigs"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.OperationalInsights/workspaces/storageInsightConfigs"
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
index 8eaa08f56b..0251c4c399 100644
--- a/schemas/common/autogeneratedResources.json
+++ b/schemas/common/autogeneratedResources.json
@@ -1681,6 +1681,15 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.ContainerService.json#/resourceDefinitions/managedClusters_privateEndpointConnections"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-07-01/Microsoft.ContainerService.json#/resourceDefinitions/managedClusters"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-07-01/Microsoft.ContainerService.json#/resourceDefinitions/managedClusters_agentPools"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-07-01/Microsoft.ContainerService.json#/resourceDefinitions/managedClusters_privateEndpointConnections"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.CustomProviders.json#/resourceDefinitions/resourceProviders"
         },
@@ -1840,6 +1849,12 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_linkedservices"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_managedVirtualNetworks"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_managedVirtualNetworks_managedPrivateEndpoints"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_pipelines"
         },
@@ -1975,9 +1990,6 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.DBforMariaDB.json#/resourceDefinitions/servers_virtualNetworkRules"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.DBforMariaDB.json#/resourceDefinitions/servers_securityAlertPolicies"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers"
         },
@@ -2026,9 +2038,6 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_keys"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_securityAlertPolicies"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers"
         },
@@ -2074,27 +2083,9 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_privateEndpointConnections"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2018-06-01-privatepreview/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_privateEndpointConnections"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_keys"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_securityAlertPolicies"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-01-01-privatepreview/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_keys"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-02-14-privatepreview/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/flexibleServers"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-02-14-privatepreview/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/flexibleServers_firewallRules"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-02-14-privatepreview/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/flexibleServers_maintenanceWindows"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-09-01-preview/Microsoft.DeploymentManager.json#/resourceDefinitions/artifactSources"
         },
@@ -3421,6 +3412,9 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-02-01-preview/Microsoft.Maps.json#/resourceDefinitions/accounts"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-02-01-preview/Microsoft.Maps.json#/resourceDefinitions/accounts_creators"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-02-01-preview/Microsoft.Maps.json#/resourceDefinitions/accounts_privateAtlases"
         },
@@ -3640,6 +3634,24 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.OffAzure.json#/resourceDefinitions/VMwareSites_vCenters"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-07-07/Microsoft.OffAzure.json#/resourceDefinitions/HyperVSites"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-07-07/Microsoft.OffAzure.json#/resourceDefinitions/HyperVSites_clusters"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-07-07/Microsoft.OffAzure.json#/resourceDefinitions/HyperVSites_hosts"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-07-07/Microsoft.OffAzure.json#/resourceDefinitions/MasterSites"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-07-07/Microsoft.OffAzure.json#/resourceDefinitions/VMwareSites"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-07-07/Microsoft.OffAzure.json#/resourceDefinitions/VMwareSites_vCenters"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2015-03-20/Microsoft.OperationalInsights.json#/resourceDefinitions/workspaces_savedSearches"
         },
@@ -3691,6 +3703,30 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.OperationalInsights.json#/resourceDefinitions/workspaces_storageInsightConfigs"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.OperationalInsights.json#/resourceDefinitions/clusters"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.OperationalInsights.json#/resourceDefinitions/workspaces"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.OperationalInsights.json#/resourceDefinitions/workspaces_dataExports"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.OperationalInsights.json#/resourceDefinitions/workspaces_dataSources"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.OperationalInsights.json#/resourceDefinitions/workspaces_linkedServices"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.OperationalInsights.json#/resourceDefinitions/workspaces_linkedStorageAccounts"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.OperationalInsights.json#/resourceDefinitions/workspaces_savedSearches"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.OperationalInsights.json#/resourceDefinitions/workspaces_storageInsightConfigs"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2019-08-01-preview/Microsoft.Peering.json#/resourceDefinitions/peerings"
         },