diff --git a/generator/resources.json b/generator/resources.json
index f9fa184061..23cf0ebf88 100644
--- a/generator/resources.json
+++ b/generator/resources.json
@@ -796,22 +796,6 @@
     "2020-07-01-preview",
     "2021-02-01-preview"
   ],
-  "Microsoft.AzureData/dataControllers": [
-    "2019-07-24-preview",
-    "2020-09-08-preview"
-  ],
-  "Microsoft.AzureData/postgresInstances": [
-    "2019-07-24-preview",
-    "2020-09-08-preview"
-  ],
-  "Microsoft.AzureData/sqlManagedInstances": [
-    "2019-07-24-preview",
-    "2020-09-08-preview"
-  ],
-  "Microsoft.AzureData/sqlServerInstances": [
-    "2019-07-24-preview",
-    "2020-09-08-preview"
-  ],
   "Microsoft.AzureData/sqlServerRegistrations": [
     "2019-07-24-preview"
   ],
@@ -1155,6 +1139,7 @@
     "2017-04-18"
   ],
   "Microsoft.Communication/communicationServices": [
+    "2020-08-20",
     "2020-08-20-preview"
   ],
   "Microsoft.Compute/availabilitySets": [
@@ -1751,6 +1736,9 @@
     "2017-09-01-preview",
     "2018-06-01"
   ],
+  "Microsoft.DataFactory/factories/privateEndpointConnections": [
+    "2018-06-01"
+  ],
   "Microsoft.DataFactory/factories/triggers": [
     "2017-09-01-preview",
     "2018-06-01"
@@ -1873,16 +1861,20 @@
     "2018-04-01"
   ],
   "Microsoft.Datadog/agreements": [
-    "2020-02-01-preview"
+    "2020-02-01-preview",
+    "2021-03-01"
   ],
   "Microsoft.Datadog/monitors": [
-    "2020-02-01-preview"
+    "2020-02-01-preview",
+    "2021-03-01"
   ],
   "Microsoft.Datadog/monitors/singleSignOnConfigurations": [
-    "2020-02-01-preview"
+    "2020-02-01-preview",
+    "2021-03-01"
   ],
   "Microsoft.Datadog/monitors/tagRules": [
-    "2020-02-01-preview"
+    "2020-02-01-preview",
+    "2021-03-01"
   ],
   "Microsoft.DeploymentManager/artifactSources": [
     "2018-09-01-preview",
@@ -2748,7 +2740,12 @@
     "2014-04-01",
     "2016-03-01"
   ],
+  "Microsoft.Insights/autoscalesettings": [
+    "2014-04-01",
+    "2015-04-01"
+  ],
   "Microsoft.Insights/components": [
+    "2014-04-01",
     "2015-05-01",
     "2018-05-01-preview",
     "2020-02-02-preview"
@@ -2786,6 +2783,7 @@
     "2019-10-17-preview"
   ],
   "Microsoft.Insights/webtests": [
+    "2014-04-01",
     "2015-05-01",
     "2020-10-05-preview"
   ],
@@ -3236,7 +3234,8 @@
     "2020-07-01",
     "2020-08-01",
     "2020-09-01",
-    "2020-11-01"
+    "2020-11-01",
+    "2020-12-01"
   ],
   "Microsoft.NetApp/netAppAccounts/backupPolicies": [
     "2020-05-01",
@@ -3244,7 +3243,8 @@
     "2020-07-01",
     "2020-08-01",
     "2020-09-01",
-    "2020-11-01"
+    "2020-11-01",
+    "2020-12-01"
   ],
   "Microsoft.NetApp/netAppAccounts/capacityPools": [
     "2017-08-15",
@@ -3261,7 +3261,8 @@
     "2020-07-01",
     "2020-08-01",
     "2020-09-01",
-    "2020-11-01"
+    "2020-11-01",
+    "2020-12-01"
   ],
   "Microsoft.NetApp/netAppAccounts/capacityPools/volumes": [
     "2017-08-15",
@@ -3278,7 +3279,8 @@
     "2020-07-01",
     "2020-08-01",
     "2020-09-01",
-    "2020-11-01"
+    "2020-11-01",
+    "2020-12-01"
   ],
   "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups": [
     "2020-05-01",
@@ -3286,7 +3288,8 @@
     "2020-07-01",
     "2020-08-01",
     "2020-09-01",
-    "2020-11-01"
+    "2020-11-01",
+    "2020-12-01"
   ],
   "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots": [
     "2017-08-15",
@@ -3303,7 +3306,8 @@
     "2020-07-01",
     "2020-08-01",
     "2020-09-01",
-    "2020-11-01"
+    "2020-11-01",
+    "2020-12-01"
   ],
   "Microsoft.NetApp/netAppAccounts/snapshotPolicies": [
     "2020-05-01",
@@ -3311,7 +3315,8 @@
     "2020-07-01",
     "2020-08-01",
     "2020-09-01",
-    "2020-11-01"
+    "2020-11-01",
+    "2020-12-01"
   ],
   "Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies": [
     "2018-12-01",
@@ -3327,7 +3332,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/ExpressRoutePorts": [
     "2018-08-01",
@@ -3346,7 +3352,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/FrontDoorWebApplicationFirewallPolicies": [
     "2018-08-01",
@@ -3360,7 +3367,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/NetworkExperimentProfiles": [
     "2019-11-01"
@@ -3398,12 +3406,14 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/applicationGateways/privateEndpointConnections": [
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/applicationSecurityGroups": [
     "2017-09-01",
@@ -3430,7 +3440,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/azureFirewalls": [
     "2018-04-01",
@@ -3447,7 +3458,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/bastionHosts": [
     "2019-04-01",
@@ -3461,7 +3473,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/connections": [
     "2015-05-01-preview",
@@ -3493,13 +3506,15 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/connections/sharedkey": [
     "2019-12-01"
   ],
   "Microsoft.Network/customIpPrefixes": [
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/ddosCustomPolicies": [
     "2019-04-01",
@@ -3513,7 +3528,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/ddosProtectionPlans": [
     "2018-02-01",
@@ -3536,7 +3552,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/dnsZones/CAA": [
     "2017-09-01",
@@ -3614,7 +3631,8 @@
     "2018-05-01"
   ],
   "Microsoft.Network/dscpConfigurations": [
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/expressRouteCircuits": [
     "2015-06-15",
@@ -3639,7 +3657,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/expressRouteCircuits/authorizations": [
     "2015-05-01-preview",
@@ -3664,7 +3683,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/expressRouteCircuits/peerings": [
     "2015-05-01-preview",
@@ -3684,7 +3704,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/expressRouteCircuits/peerings/connections": [
     "2018-04-01",
@@ -3701,7 +3722,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/expressRouteCrossConnections": [
     "2018-02-01",
@@ -3724,7 +3746,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/expressRouteCrossConnections/peerings": [
     "2018-04-01",
@@ -3741,7 +3764,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/expressRouteGateways": [
     "2019-04-01",
@@ -3755,7 +3779,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/expressRouteGateways/expressRouteConnections": [
     "2019-04-01",
@@ -3769,7 +3794,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/firewallPolicies": [
     "2019-06-01",
@@ -3782,12 +3808,14 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/firewallPolicies/ruleCollectionGroups": [
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/firewallPolicies/ruleGroups": [
     "2019-06-01",
@@ -3820,7 +3848,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/loadBalancers": [
     "2015-05-01-preview",
@@ -3860,13 +3889,15 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/loadBalancers/backendAddressPools": [
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/loadBalancers/inboundNatRules": [
     "2018-04-01",
@@ -3883,7 +3914,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/localNetworkGateways": [
     "2015-05-01-preview",
@@ -3915,7 +3947,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/natGateways": [
     "2019-02-01",
@@ -3930,7 +3963,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkInterfaces": [
     "2015-05-01-preview",
@@ -3970,7 +4004,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkInterfaces/tapConfigurations": [
     "2019-04-01",
@@ -3984,7 +4019,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkProfiles": [
     "2019-04-01",
@@ -3998,7 +4034,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkSecurityGroups": [
     "2015-05-01-preview",
@@ -4038,7 +4075,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkSecurityGroups/securityRules": [
     "2015-05-01-preview",
@@ -4058,7 +4096,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkVirtualAppliances": [
     "2019-12-01",
@@ -4066,15 +4105,18 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkVirtualAppliances/inboundSecurityRules": [
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkVirtualAppliances/virtualApplianceSites": [
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkWatchers": [
     "2018-04-01",
@@ -4091,7 +4133,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkWatchers/connectionMonitors": [
     "2018-04-01",
@@ -4105,7 +4148,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkWatchers/flowLogs": [
     "2019-11-01",
@@ -4114,7 +4158,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/networkWatchers/packetCaptures": [
     "2018-04-01",
@@ -4131,7 +4176,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/p2svpnGateways": [
     "2019-04-01",
@@ -4145,7 +4191,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/privateDnsZones": [
     "2018-09-01"
@@ -4189,14 +4236,16 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/privateEndpoints/privateDnsZoneGroups": [
     "2020-03-01",
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/privateLinkServices": [
     "2019-04-01",
@@ -4210,7 +4259,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/privateLinkServices/privateEndpointConnections": [
     "2019-04-01",
@@ -4224,7 +4274,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/publicIPAddresses": [
     "2015-05-01-preview",
@@ -4264,7 +4315,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/publicIPPrefixes": [
     "2018-07-01",
@@ -4279,7 +4331,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/routeFilters": [
     "2018-04-01",
@@ -4296,7 +4349,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/routeFilters/routeFilterRules": [
     "2018-04-01",
@@ -4313,7 +4367,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/routeTables": [
     "2015-05-01-preview",
@@ -4353,7 +4408,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/routeTables/routes": [
     "2015-05-01-preview",
@@ -4373,14 +4429,16 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/securityPartnerProviders": [
     "2020-03-01",
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/serviceEndpointPolicies": [
     "2018-07-01",
@@ -4395,7 +4453,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/serviceEndpointPolicies/serviceEndpointPolicyDefinitions": [
     "2018-07-01",
@@ -4410,7 +4469,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/trafficManagerProfiles": [
     "2015-11-01",
@@ -4433,28 +4493,33 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualHubs/bgpConnections": [
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualHubs/hubRouteTables": [
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualHubs/hubVirtualNetworkConnections": [
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualHubs/ipConfigurations": [
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualHubs/routeTables": [
     "2019-09-01",
@@ -4464,7 +4529,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualNetworkGateways": [
     "2015-05-01-preview",
@@ -4496,7 +4562,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualNetworkTaps": [
     "2019-04-01",
@@ -4510,7 +4577,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualNetworks": [
     "2015-05-01-preview",
@@ -4550,7 +4618,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualNetworks/subnets": [
     "2015-05-01-preview",
@@ -4582,7 +4651,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualNetworks/virtualNetworkPeerings": [
     "2017-06-01",
@@ -4611,7 +4681,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualRouters": [
     "2019-07-01",
@@ -4623,7 +4694,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualRouters/peerings": [
     "2019-07-01",
@@ -4635,7 +4707,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualWans": [
     "2018-04-01",
@@ -4652,7 +4725,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/virtualWans/p2sVpnServerConfigurations": [
     "2019-04-01",
@@ -4674,10 +4748,12 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/vpnGateways/natRules": [
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/vpnGateways/vpnConnections": [
     "2018-04-01",
@@ -4694,7 +4770,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/vpnServerConfigurations": [
     "2019-08-01",
@@ -4705,7 +4782,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.Network/vpnSites": [
     "2018-04-01",
@@ -4722,7 +4800,8 @@
     "2020-04-01",
     "2020-05-01",
     "2020-06-01",
-    "2020-08-01"
+    "2020-08-01",
+    "2020-11-01"
   ],
   "Microsoft.NotificationHubs/namespaces": [
     "2014-09-01",
@@ -4922,7 +5001,8 @@
     "2017-07-01",
     "2018-01-10",
     "2020-02-02",
-    "2020-10-01"
+    "2020-10-01",
+    "2021-01-01"
   ],
   "Microsoft.RecoveryServices/vaults/backupEncryptionConfigs": [
     "2020-10-01",
@@ -4976,12 +5056,14 @@
   "Microsoft.RecoveryServices/vaults/certificates": [
     "2016-06-01",
     "2020-02-02",
-    "2020-10-01"
+    "2020-10-01",
+    "2021-01-01"
   ],
   "Microsoft.RecoveryServices/vaults/extendedInformation": [
     "2016-06-01",
     "2020-02-02",
-    "2020-10-01"
+    "2020-10-01",
+    "2021-01-01"
   ],
   "Microsoft.RecoveryServices/vaults/privateEndpointConnections": [
     "2020-02-02",
@@ -5937,6 +6019,12 @@
     "2020-03-01",
     "2020-10-01"
   ],
+  "Microsoft.StoragePool/diskPools": [
+    "2020-03-15-preview"
+  ],
+  "Microsoft.StoragePool/diskPools/iscsiTargets": [
+    "2020-03-15-preview"
+  ],
   "Microsoft.StorageSync/storageSyncServices": [
     "2017-06-05-preview",
     "2018-04-02",
@@ -6476,9 +6564,6 @@
     "2017-04-01",
     "2020-10-01"
   ],
-  "microsoft.insights/autoscalesettings": [
-    "2015-04-01"
-  ],
   "microsoft.insights/components/analyticsItems": [
     "2015-05-01"
   ],
diff --git a/schemas/2015-05-01/Microsoft.Insights.Application.json b/schemas/2015-05-01/Microsoft.Insights.Application.json
index 95eeb59b0f..f9a50df00b 100644
--- a/schemas/2015-05-01/Microsoft.Insights.Application.json
+++ b/schemas/2015-05-01/Microsoft.Insights.Application.json
@@ -493,7 +493,7 @@
             }
           ],
           "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
-        },
+        },        
         "type": {
           "type": "string",
           "enum": [
diff --git a/schemas/2016-06-01/Microsoft.HybridData.json b/schemas/2016-06-01/Microsoft.HybridData.json
index b53ee5315f..acd15be98e 100644
--- a/schemas/2016-06-01/Microsoft.HybridData.json
+++ b/schemas/2016-06-01/Microsoft.HybridData.json
@@ -461,4 +461,4 @@
       "description": "The sku type."
     }
   }
-}
+}
\ No newline at end of file
diff --git a/schemas/2018-01-01/Microsoft.ApiManagement.json b/schemas/2018-01-01/Microsoft.ApiManagement.json
index aea6cac4fb..b1534598b7 100644
--- a/schemas/2018-01-01/Microsoft.ApiManagement.json
+++ b/schemas/2018-01-01/Microsoft.ApiManagement.json
@@ -2614,7 +2614,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "An value that determines where the API Version identifer will be located in a HTTP request."
+          "description": "An value that determines where the API Version identifier will be located in a HTTP request."
         },
         "versionQueryName": {
           "type": "string",
diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
index 2fcddb32e5..15f62c1764 100644
--- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json
+++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -195,6 +195,9 @@
               {
                 "$ref": "https://schema.management.azure.com/schemas/2020-02-01-preview/Microsoft.Datadog.json#/subscription_resourceDefinitions/agreements"
               },
+              {
+                "$ref": "https://schema.management.azure.com/schemas/2021-03-01/Microsoft.Datadog.json#/subscription_resourceDefinitions/agreements"
+              },
               {
                 "$ref": "https://schema.management.azure.com/schemas/2017-06-15-preview/Microsoft.EventGrid.json#/unknown_resourceDefinitions/eventSubscriptions"
               },
diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json
index 41891e6a92..93dea0e0e5 100644
--- a/schemas/2018-06-01/Microsoft.DataFactory.json
+++ b/schemas/2018-06-01/Microsoft.DataFactory.json
@@ -77,6 +77,9 @@
               },
               {
                 "$ref": "#/definitions/factories_managedVirtualNetworks_childResource"
+              },
+              {
+                "$ref": "#/definitions/factories_privateEndpointConnections_childResource"
               }
             ]
           }
@@ -464,6 +467,45 @@
       ],
       "description": "Microsoft.DataFactory/factories/pipelines"
     },
+    "factories_privateEndpointConnections": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-06-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The private endpoint connection name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PrivateLinkConnectionApprovalRequest"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A request to approve or reject a private endpoint connection"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.DataFactory/factories/privateEndpointConnections"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.DataFactory/factories/privateEndpointConnections"
+    },
     "factories_triggers": {
       "type": "object",
       "properties": {
@@ -1015,6 +1057,166 @@
       },
       "description": "Amazon Redshift table dataset properties."
     },
+    "AmazonS3CompatibleLinkedService": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "AmazonS3Compatible"
+          ]
+        },
+        "typeProperties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AmazonS3CompatibleLinkedServiceTypeProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Amazon S3 Compatible linked service properties."
+        }
+      },
+      "required": [
+        "type",
+        "typeProperties"
+      ],
+      "description": "Linked service for Amazon S3 Compatible."
+    },
+    "AmazonS3CompatibleLinkedServiceTypeProperties": {
+      "type": "object",
+      "properties": {
+        "accessKeyId": {
+          "type": "object",
+          "properties": {},
+          "description": "The access key identifier of the Amazon S3 Compatible Identity and Access Management (IAM) user. Type: string (or Expression with resultType string)."
+        },
+        "encryptedCredential": {
+          "type": "object",
+          "properties": {},
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        },
+        "forcePathStyle": {
+          "type": "object",
+          "properties": {},
+          "description": "If true, use S3 path-style access instead of virtual hosted-style access. Default value is false. Type: boolean (or Expression with resultType boolean)."
+        },
+        "secretAccessKey": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SecretBase"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The base definition of a secret type."
+        },
+        "serviceUrl": {
+          "type": "object",
+          "properties": {},
+          "description": "This value specifies the endpoint to access with the Amazon S3 Compatible Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string)."
+        }
+      },
+      "description": "Amazon S3 Compatible linked service properties."
+    },
+    "AmazonS3CompatibleLocation": {
+      "type": "object",
+      "properties": {
+        "bucketName": {
+          "type": "object",
+          "properties": {},
+          "description": "Specify the bucketName of Amazon S3 Compatible. Type: string (or Expression with resultType string)"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "AmazonS3CompatibleLocation"
+          ]
+        },
+        "version": {
+          "type": "object",
+          "properties": {},
+          "description": "Specify the version of Amazon S3 Compatible. Type: string (or Expression with resultType string)."
+        }
+      },
+      "required": [
+        "type"
+      ],
+      "description": "The location of Amazon S3 Compatible dataset."
+    },
+    "AmazonS3CompatibleReadSettings": {
+      "type": "object",
+      "properties": {
+        "deleteFilesAfterCompletion": {
+          "type": "object",
+          "properties": {},
+          "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)."
+        },
+        "enablePartitionDiscovery": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates whether to enable partition discovery."
+        },
+        "fileListPath": {
+          "type": "object",
+          "properties": {},
+          "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)."
+        },
+        "modifiedDatetimeEnd": {
+          "type": "object",
+          "properties": {},
+          "description": "The end of file's modified datetime. Type: string (or Expression with resultType string)."
+        },
+        "modifiedDatetimeStart": {
+          "type": "object",
+          "properties": {},
+          "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)."
+        },
+        "partitionRootPath": {
+          "type": "object",
+          "properties": {},
+          "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)."
+        },
+        "prefix": {
+          "type": "object",
+          "properties": {},
+          "description": "The prefix filter for the S3 Compatible object name. Type: string (or Expression with resultType string)."
+        },
+        "recursive": {
+          "type": "object",
+          "properties": {},
+          "description": "If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean)."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "AmazonS3CompatibleReadSettings"
+          ]
+        },
+        "wildcardFileName": {
+          "type": "object",
+          "properties": {},
+          "description": "Amazon S3 Compatible wildcardFileName. Type: string (or Expression with resultType string)."
+        },
+        "wildcardFolderPath": {
+          "type": "object",
+          "properties": {},
+          "description": "Amazon S3 Compatible wildcardFolderPath. Type: string (or Expression with resultType string)."
+        }
+      },
+      "required": [
+        "type"
+      ],
+      "description": "Amazon S3 Compatible read settings."
+    },
     "AmazonS3Dataset": {
       "type": "object",
       "properties": {
@@ -1272,7 +1474,7 @@
       "required": [
         "type"
       ],
-      "description": "Azure data lake store read settings."
+      "description": "Amazon S3 read settings."
     },
     "AppendVariableActivity": {
       "type": "object",
@@ -2061,6 +2263,10 @@
           ],
           "description": "Azure Key Vault secret reference."
         },
+        "accountKind": {
+          "type": "string",
+          "description": "Specify the kind of your storage account. Allowed values are: Storage (general purpose v1), StorageV2 (general purpose v2), BlobStorage, or BlockBlobStorage. Type: string (or Expression with resultType string)."
+        },
         "azureCloudType": {
           "type": "object",
           "properties": {},
@@ -2746,10 +2952,7 @@
       },
       "required": [
         "database",
-        "endpoint",
-        "servicePrincipalId",
-        "servicePrincipalKey",
-        "tenant"
+        "endpoint"
       ],
       "description": "Azure Data Explorer (Kusto) linked service properties."
     },
@@ -7000,6 +7203,26 @@
           ],
           "description": "The base definition of a secret type."
         },
+        "azureCloudType": {
+          "type": "object",
+          "properties": {},
+          "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)."
+        },
+        "connectionMode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Gateway",
+                "Direct"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The connection mode used to access CosmosDB account. Type: string (or Expression with resultType string)."
+        },
         "connectionString": {
           "type": "object",
           "properties": {},
@@ -7014,6 +7237,42 @@
           "type": "object",
           "properties": {},
           "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        },
+        "servicePrincipalCredential": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SecretBase"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The base definition of a secret type."
+        },
+        "servicePrincipalCredentialType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "ServicePrincipalKey",
+                "ServicePrincipalCert"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)."
+        },
+        "servicePrincipalId": {
+          "type": "object",
+          "properties": {},
+          "description": "The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string)."
+        },
+        "tenant": {
+          "type": "object",
+          "properties": {},
+          "description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
         }
       },
       "description": "CosmosDB linked service properties."
@@ -8680,6 +8939,12 @@
         {
           "$ref": "#/definitions/AzureFileStorageLocation"
         },
+        {
+          "$ref": "#/definitions/AmazonS3CompatibleLocation"
+        },
+        {
+          "$ref": "#/definitions/OracleCloudStorageLocation"
+        },
         {
           "$ref": "#/definitions/GoogleCloudStorageLocation"
         },
@@ -11545,6 +11810,45 @@
       ],
       "description": "Microsoft.DataFactory/factories/pipelines"
     },
+    "factories_privateEndpointConnections_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-06-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The private endpoint connection name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PrivateLinkConnectionApprovalRequest"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A request to approve or reject a private endpoint connection"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "privateEndpointConnections"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.DataFactory/factories/privateEndpointConnections"
+    },
     "factories_triggers_childResource": {
       "type": "object",
       "properties": {
@@ -14879,6 +15183,11 @@
           ],
           "description": "The authentication type to be used to connect to the HTTP server."
         },
+        "authHeaders": {
+          "type": "object",
+          "properties": {},
+          "description": "The additional HTTP headers in the request to RESTful API used for authorization. Type: object (or Expression with resultType object)."
+        },
         "certThumbprint": {
           "type": "object",
           "properties": {},
@@ -16585,6 +16894,12 @@
         {
           "$ref": "#/definitions/AzureFileStorageLinkedService"
         },
+        {
+          "$ref": "#/definitions/AmazonS3CompatibleLinkedService"
+        },
+        {
+          "$ref": "#/definitions/OracleCloudStorageLinkedService"
+        },
         {
           "$ref": "#/definitions/GoogleCloudStorageLinkedService"
         },
@@ -18766,6 +19081,11 @@
           ],
           "description": "Type of authentication used to connect to the OData service."
         },
+        "authHeaders": {
+          "type": "object",
+          "properties": {},
+          "description": "The additional HTTP headers in the request to RESTful API used for authorization. Type: object (or Expression with resultType object)."
+        },
         "azureCloudType": {
           "type": "object",
           "properties": {},
@@ -19238,6 +19558,161 @@
       ],
       "description": "A copy activity source for an Office 365 service."
     },
+    "OracleCloudStorageLinkedService": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "OracleCloudStorage"
+          ]
+        },
+        "typeProperties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/OracleCloudStorageLinkedServiceTypeProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Oracle Cloud Storage linked service properties."
+        }
+      },
+      "required": [
+        "type",
+        "typeProperties"
+      ],
+      "description": "Linked service for Oracle Cloud Storage."
+    },
+    "OracleCloudStorageLinkedServiceTypeProperties": {
+      "type": "object",
+      "properties": {
+        "accessKeyId": {
+          "type": "object",
+          "properties": {},
+          "description": "The access key identifier of the Oracle Cloud Storage Identity and Access Management (IAM) user. Type: string (or Expression with resultType string)."
+        },
+        "encryptedCredential": {
+          "type": "object",
+          "properties": {},
+          "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
+        },
+        "secretAccessKey": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SecretBase"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The base definition of a secret type."
+        },
+        "serviceUrl": {
+          "type": "object",
+          "properties": {},
+          "description": "This value specifies the endpoint to access with the Oracle Cloud Storage Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string)."
+        }
+      },
+      "description": "Oracle Cloud Storage linked service properties."
+    },
+    "OracleCloudStorageLocation": {
+      "type": "object",
+      "properties": {
+        "bucketName": {
+          "type": "object",
+          "properties": {},
+          "description": "Specify the bucketName of Oracle Cloud Storage. Type: string (or Expression with resultType string)"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "OracleCloudStorageLocation"
+          ]
+        },
+        "version": {
+          "type": "object",
+          "properties": {},
+          "description": "Specify the version of Oracle Cloud Storage. Type: string (or Expression with resultType string)."
+        }
+      },
+      "required": [
+        "type"
+      ],
+      "description": "The location of Oracle Cloud Storage dataset."
+    },
+    "OracleCloudStorageReadSettings": {
+      "type": "object",
+      "properties": {
+        "deleteFilesAfterCompletion": {
+          "type": "object",
+          "properties": {},
+          "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)."
+        },
+        "enablePartitionDiscovery": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates whether to enable partition discovery."
+        },
+        "fileListPath": {
+          "type": "object",
+          "properties": {},
+          "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)."
+        },
+        "modifiedDatetimeEnd": {
+          "type": "object",
+          "properties": {},
+          "description": "The end of file's modified datetime. Type: string (or Expression with resultType string)."
+        },
+        "modifiedDatetimeStart": {
+          "type": "object",
+          "properties": {},
+          "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)."
+        },
+        "partitionRootPath": {
+          "type": "object",
+          "properties": {},
+          "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)."
+        },
+        "prefix": {
+          "type": "object",
+          "properties": {},
+          "description": "The prefix filter for the Oracle Cloud Storage object name. Type: string (or Expression with resultType string)."
+        },
+        "recursive": {
+          "type": "object",
+          "properties": {},
+          "description": "If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean)."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "OracleCloudStorageReadSettings"
+          ]
+        },
+        "wildcardFileName": {
+          "type": "object",
+          "properties": {},
+          "description": "Oracle Cloud Storage wildcardFileName. Type: string (or Expression with resultType string)."
+        },
+        "wildcardFolderPath": {
+          "type": "object",
+          "properties": {},
+          "description": "Oracle Cloud Storage wildcardFolderPath. Type: string (or Expression with resultType string)."
+        }
+      },
+      "required": [
+        "type"
+      ],
+      "description": "Oracle Cloud Storage read settings."
+    },
     "OracleLinkedService": {
       "type": "object",
       "properties": {
@@ -20867,6 +21342,41 @@
       ],
       "description": "A copy activity Presto server source."
     },
+    "PrivateLinkConnectionApprovalRequest": {
+      "type": "object",
+      "properties": {
+        "privateLinkServiceConnectionState": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PrivateLinkConnectionState"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The state of a private link connection"
+        }
+      },
+      "description": "A request to approve or reject a private endpoint connection"
+    },
+    "PrivateLinkConnectionState": {
+      "type": "object",
+      "properties": {
+        "actionsRequired": {
+          "type": "string",
+          "description": "ActionsRequired for a private link connection"
+        },
+        "description": {
+          "type": "string",
+          "description": "Description of a private link connection"
+        },
+        "status": {
+          "type": "string",
+          "description": "Status of a private link connection"
+        }
+      },
+      "description": "The state of a private link connection"
+    },
     "QuickBooksLinkedService": {
       "type": "object",
       "properties": {
@@ -21595,6 +22105,11 @@
           ],
           "description": "Type of authentication used to connect to the REST service."
         },
+        "authHeaders": {
+          "type": "object",
+          "properties": {},
+          "description": "The additional HTTP headers in the request to RESTful API used for authorization. Type: object (or Expression with resultType object)."
+        },
         "azureCloudType": {
           "type": "object",
           "properties": {},
@@ -23884,7 +24399,8 @@
               "type": "string",
               "enum": [
                 "Basic",
-                "SshPublicKey"
+                "SshPublicKey",
+                "MultiFactor"
               ]
             },
             {
@@ -25912,6 +26428,12 @@
         {
           "$ref": "#/definitions/AzureFileStorageReadSettings"
         },
+        {
+          "$ref": "#/definitions/AmazonS3CompatibleReadSettings"
+        },
+        {
+          "$ref": "#/definitions/OracleCloudStorageReadSettings"
+        },
         {
           "$ref": "#/definitions/GoogleCloudStorageReadSettings"
         },
diff --git a/schemas/2018-09-15/Microsoft.DevTestLab.json b/schemas/2018-09-15/Microsoft.DevTestLab.json
index 50ffc5a91f..bbb8a5f389 100644
--- a/schemas/2018-09-15/Microsoft.DevTestLab.json
+++ b/schemas/2018-09-15/Microsoft.DevTestLab.json
@@ -1197,38 +1197,6 @@
       },
       "description": "Properties of an Azure Resource Manager template parameter."
     },
-    "ArtifactDeploymentStatusProperties": {
-      "type": "object",
-      "properties": {
-        "artifactsApplied": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The total count of the artifacts that were successfully applied."
-        },
-        "deploymentStatus": {
-          "type": "string",
-          "description": "The deployment status of the artifact."
-        },
-        "totalArtifacts": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The total count of the artifacts that were tentatively applied."
-        }
-      },
-      "description": "Properties of an artifact deployment."
-    },
     "ArtifactInstallProperties": {
       "type": "object",
       "properties": {
@@ -1317,7 +1285,8 @@
               "type": "string",
               "enum": [
                 "VsoGit",
-                "GitHub"
+                "GitHub",
+                "StorageAccount"
               ]
             },
             {
@@ -1364,7 +1333,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Size of the disk to be attached in GibiBytes."
+          "description": "Size of the disk to be attached in Gibibytes."
         },
         "diskType": {
           "oneOf": [
@@ -1716,7 +1685,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The size of the disk in GibiBytes."
+          "description": "The size of the disk in Gibibytes."
         },
         "diskType": {
           "oneOf": [
@@ -1749,6 +1718,10 @@
         "managedDiskId": {
           "type": "string",
           "description": "When backed by managed disk, this is the ID of the compute disk resource."
+        },
+        "storageAccountId": {
+          "type": "string",
+          "description": "When backed by a blob, the storage account where the blob is."
         }
       },
       "description": "Properties of a disk."
@@ -1822,10 +1795,6 @@
     "FormulaProperties": {
       "type": "object",
       "properties": {
-        "author": {
-          "type": "string",
-          "description": "The author of the formula."
-        },
         "description": {
           "type": "string",
           "description": "The description of the formula."
@@ -1928,7 +1897,20 @@
           "description": "The tenant identifier of resource."
         },
         "type": {
-          "type": "string",
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "None",
+                "SystemAssigned",
+                "UserAssigned",
+                "SystemAssigned,UserAssigned"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
           "description": "Managed identity."
         }
       },
@@ -3173,7 +3155,8 @@
         "allowClaim": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "default": false
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3181,17 +3164,6 @@
           ],
           "description": "Indicates whether another user can take ownership of the virtual machine"
         },
-        "artifactDeploymentStatus": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ArtifactDeploymentStatusProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of an artifact deployment."
-        },
         "artifacts": {
           "oneOf": [
             {
@@ -3217,18 +3189,6 @@
           ],
           "description": "Parameters for creating multiple virtual machines as a single action."
         },
-        "computeId": {
-          "type": "string",
-          "description": "The resource identifier (Microsoft.Compute) of the virtual machine."
-        },
-        "createdByUser": {
-          "type": "string",
-          "description": "The email address of creator of the virtual machine."
-        },
-        "createdByUserId": {
-          "type": "string",
-          "description": "The object identifier of the creator of the virtual machine."
-        },
         "createdDate": {
           "type": "string",
           "format": "date-time",
@@ -3255,7 +3215,8 @@
         "disallowPublicIpAddress": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "default": false
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3272,10 +3233,6 @@
           "format": "date-time",
           "description": "The expiration date for VM."
         },
-        "fqdn": {
-          "type": "string",
-          "description": "The fully-qualified domain name of the virtual machine."
-        },
         "galleryImageReference": {
           "oneOf": [
             {
@@ -3306,10 +3263,6 @@
           "type": "string",
           "description": "The lab virtual network identifier of the virtual machine."
         },
-        "lastKnownPowerState": {
-          "type": "string",
-          "description": "Last known compute power state captured in DTL"
-        },
         "networkInterface": {
           "oneOf": [
             {
@@ -3325,12 +3278,9 @@
           "type": "string",
           "description": "The notes of the virtual machine."
         },
-        "osType": {
-          "type": "string",
-          "description": "The OS type of the virtual machine."
-        },
         "ownerObjectId": {
           "type": "string",
+          "default": "dynamicValue",
           "description": "The object identifier of the owner of the virtual machine."
         },
         "ownerUserPrincipalName": {
@@ -3374,22 +3324,6 @@
         "userName": {
           "type": "string",
           "description": "The user name of the virtual machine."
-        },
-        "virtualMachineCreationSource": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "FromCustomImage",
-                "FromGalleryImage",
-                "FromSharedGalleryImage"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Tells source of creation of lab virtual machine. Output property only."
         }
       },
       "description": "Properties for virtual machine creation."
@@ -3400,7 +3334,8 @@
         "allowClaim": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "default": false
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3408,17 +3343,6 @@
           ],
           "description": "Indicates whether another user can take ownership of the virtual machine"
         },
-        "artifactDeploymentStatus": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ArtifactDeploymentStatusProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of an artifact deployment."
-        },
         "artifacts": {
           "oneOf": [
             {
@@ -3433,18 +3357,6 @@
           ],
           "description": "The artifacts to be installed on the virtual machine."
         },
-        "computeId": {
-          "type": "string",
-          "description": "The resource identifier (Microsoft.Compute) of the virtual machine."
-        },
-        "createdByUser": {
-          "type": "string",
-          "description": "The email address of creator of the virtual machine."
-        },
-        "createdByUserId": {
-          "type": "string",
-          "description": "The object identifier of the creator of the virtual machine."
-        },
         "createdDate": {
           "type": "string",
           "format": "date-time",
@@ -3471,7 +3383,8 @@
         "disallowPublicIpAddress": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "default": false
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3488,10 +3401,6 @@
           "format": "date-time",
           "description": "The expiration date for VM."
         },
-        "fqdn": {
-          "type": "string",
-          "description": "The fully-qualified domain name of the virtual machine."
-        },
         "galleryImageReference": {
           "oneOf": [
             {
@@ -3522,10 +3431,6 @@
           "type": "string",
           "description": "The lab virtual network identifier of the virtual machine."
         },
-        "lastKnownPowerState": {
-          "type": "string",
-          "description": "Last known compute power state captured in DTL"
-        },
         "networkInterface": {
           "oneOf": [
             {
@@ -3541,12 +3446,9 @@
           "type": "string",
           "description": "The notes of the virtual machine."
         },
-        "osType": {
-          "type": "string",
-          "description": "The OS type of the virtual machine."
-        },
         "ownerObjectId": {
           "type": "string",
+          "default": "dynamicValue",
           "description": "The object identifier of the owner of the virtual machine."
         },
         "ownerUserPrincipalName": {
@@ -3590,22 +3492,6 @@
         "userName": {
           "type": "string",
           "description": "The user name of the virtual machine."
-        },
-        "virtualMachineCreationSource": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "FromCustomImage",
-                "FromGalleryImage",
-                "FromSharedGalleryImage"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Tells source of creation of lab virtual machine. Output property only."
         }
       },
       "description": "Properties of a virtual machine."
diff --git a/schemas/2019-06-01-preview/Microsoft.Synapse.json b/schemas/2019-06-01-preview/Microsoft.Synapse.json
index b41beaaa71..94b1fca17b 100644
--- a/schemas/2019-06-01-preview/Microsoft.Synapse.json
+++ b/schemas/2019-06-01-preview/Microsoft.Synapse.json
@@ -3028,6 +3028,17 @@
     "ManagedIntegrationRuntime": {
       "type": "object",
       "properties": {
+        "managedVirtualNetwork": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedVirtualNetworkReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Managed Virtual Network reference type."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -3080,6 +3091,34 @@
       },
       "description": "Managed integration runtime type properties."
     },
+    "ManagedVirtualNetworkReference": {
+      "type": "object",
+      "properties": {
+        "referenceName": {
+          "type": "string",
+          "description": "Reference ManagedVirtualNetwork name."
+        },
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "ManagedVirtualNetworkReference"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Managed Virtual Network reference type."
+        }
+      },
+      "required": [
+        "referenceName",
+        "type"
+      ],
+      "description": "Managed Virtual Network reference type."
+    },
     "ManagedVirtualNetworkSettings": {
       "type": "object",
       "properties": {
diff --git a/schemas/2019-06-01/Microsoft.HybridData.json b/schemas/2019-06-01/Microsoft.HybridData.json
index 942f575438..d390b1c31e 100644
--- a/schemas/2019-06-01/Microsoft.HybridData.json
+++ b/schemas/2019-06-01/Microsoft.HybridData.json
@@ -461,4 +461,4 @@
       "description": "The sku type."
     }
   }
-}
+}
\ No newline at end of file
diff --git a/schemas/2019-07-24-preview/Microsoft.AzureData.json b/schemas/2019-07-24-preview/Microsoft.AzureData.json
index 8b9d2cefe1..82999f10b2 100644
--- a/schemas/2019-07-24-preview/Microsoft.AzureData.json
+++ b/schemas/2019-07-24-preview/Microsoft.AzureData.json
@@ -4,209 +4,6 @@
   "title": "Microsoft.AzureData",
   "description": "Microsoft AzureData Resource Types",
   "resourceDefinitions": {
-    "dataControllers": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-07-24-preview"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "type": "string"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/DataControllerProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The data controller 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.AzureData/dataControllers"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.AzureData/dataControllers"
-    },
-    "postgresInstances": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-07-24-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of PostgresInstance"
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.AzureData/postgresInstances"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "type"
-      ],
-      "description": "Microsoft.AzureData/postgresInstances"
-    },
-    "sqlManagedInstances": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-07-24-preview"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of SQL Managed Instances"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SqlManagedInstanceProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of sqlManagedInstance."
-        },
-        "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.AzureData/sqlManagedInstances"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.AzureData/sqlManagedInstances"
-    },
-    "sqlServerInstances": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-07-24-preview"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of SQL Server Instance"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SqlServerInstanceProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of SqlServerInstance."
-        },
-        "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.AzureData/sqlServerInstances"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.AzureData/sqlServerInstances"
-    },
     "sqlServerRegistrations": {
       "type": "object",
       "properties": {
@@ -317,119 +114,6 @@
     }
   },
   "definitions": {
-    "DataControllerProperties": {
-      "type": "object",
-      "properties": {
-        "onPremiseProperty": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/OnPremiseProperty"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties from the on premise data controller"
-        }
-      },
-      "required": [
-        "onPremiseProperty"
-      ],
-      "description": "The data controller properties."
-    },
-    "OnPremiseProperty": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A globally unique ID identifying the associated on premise cluster"
-        },
-        "publicSigningKey": {
-          "type": "string",
-          "description": "Certificate that contains the on premise cluster public key used to verify signing"
-        },
-        "signingCertificateThumbprint": {
-          "type": "string",
-          "description": "Unique thumbprint returned to customer to verify the certificate being uploaded"
-        }
-      },
-      "required": [
-        "id",
-        "publicSigningKey"
-      ],
-      "description": "Properties from the on premise data controller"
-    },
-    "SqlManagedInstanceProperties": {
-      "type": "object",
-      "properties": {
-        "admin": {
-          "type": "string",
-          "description": "The instance admin user"
-        },
-        "dataControllerId": {
-          "type": "string",
-          "description": "null"
-        },
-        "endTime": {
-          "type": "string",
-          "description": "The instance end time"
-        },
-        "instanceEndpoint": {
-          "type": "string",
-          "description": "The on premise instance endpoint"
-        },
-        "startTime": {
-          "type": "string",
-          "description": "The instance start time"
-        },
-        "vCore": {
-          "type": "string",
-          "description": "The instance vCore"
-        }
-      },
-      "description": "Properties of sqlManagedInstance."
-    },
-    "SqlServerInstanceProperties": {
-      "type": "object",
-      "properties": {
-        "containerResourceId": {
-          "type": "string",
-          "description": "ARM Resource id of the container resource (Azure Arc for Servers)"
-        },
-        "edition": {
-          "type": "string",
-          "description": "SQL Server edition."
-        },
-        "status": {
-          "type": "string",
-          "description": "The cloud connectivity status."
-        },
-        "vCore": {
-          "type": "string",
-          "description": "The number of logical processors used by the SQL Server instance."
-        },
-        "version": {
-          "type": "string",
-          "description": "SQL Server version."
-        }
-      },
-      "required": [
-        "containerResourceId",
-        "edition",
-        "status",
-        "vCore",
-        "version"
-      ],
-      "description": "Properties of SqlServerInstance."
-    },
     "SqlServerProperties": {
       "type": "object",
       "properties": {
diff --git a/schemas/2019-09-01/Microsoft.KeyVault.json b/schemas/2019-09-01/Microsoft.KeyVault.json
index 2f9196ffd3..493514216c 100644
--- a/schemas/2019-09-01/Microsoft.KeyVault.json
+++ b/schemas/2019-09-01/Microsoft.KeyVault.json
@@ -443,39 +443,6 @@
           ],
           "description": "The elliptic curve name. For valid values, see JsonWebKeyCurveName."
         },
-        "keyOps": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "type": "string",
-                "enum": [
-                  "encrypt",
-                  "decrypt",
-                  "sign",
-                  "verify",
-                  "wrapKey",
-                  "unwrapKey",
-                  "import"
-                ]
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "keySize": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The key size in bits. For example: 2048, 3072, or 4096 for RSA."
-        },
         "kty": {
           "oneOf": [
             {
diff --git a/schemas/2019-11-01-preview/Microsoft.Insights.json b/schemas/2019-11-01-preview/Microsoft.Insights.json
index bc96a27105..6578262e82 100644
--- a/schemas/2019-11-01-preview/Microsoft.Insights.json
+++ b/schemas/2019-11-01-preview/Microsoft.Insights.json
@@ -13,22 +13,27 @@
             "2019-11-01-preview"
           ]
         },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives."
-        },
-        "name": {
+        "kind": {
           "oneOf": [
             {
               "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
+              "enum": [
+                "Linux",
+                "Windows"
+              ]
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
+          "description": "The kind of the resource."
+        },
+        "location": {
+          "type": "string",
+          "description": "The geo-location where the resource lives."
+        },
+        "name": {
+          "type": "string",
           "description": "The name of the data collection rule. The name is case insensitive."
         },
         "properties": {
@@ -85,18 +90,8 @@
           ]
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 1,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The name of the association."
+          "type": "string",
+          "description": "The name of the association. The name is case insensitive."
         },
         "properties": {
           "oneOf": [
@@ -135,13 +130,9 @@
         },
         "description": {
           "type": "string",
-          "maxLength": 256,
           "description": "Description of the association."
         }
       },
-      "required": [
-        "dataCollectionRuleId"
-      ],
       "description": "Resource properties."
     },
     "DataCollectionRuleDataSources": {
@@ -267,7 +258,6 @@
         },
         "description": {
           "type": "string",
-          "maxLength": 256,
           "description": "Description of the data collection rule."
         },
         "destinations": {
@@ -282,10 +272,6 @@
           "description": "The specification of destinations."
         }
       },
-      "required": [
-        "dataFlows",
-        "destinations"
-      ],
       "description": "Resource properties."
     },
     "DataFlow": {
@@ -312,24 +298,9 @@
               "items": {
                 "type": "string",
                 "enum": [
-                  "Microsoft-AntiMalwareStatus",
-                  "Microsoft-Auditd",
-                  "Microsoft-CISCOASA",
-                  "Microsoft-CommonSecurityLog",
-                  "Microsoft-ComputerGroup",
                   "Microsoft-Event",
-                  "Microsoft-FirewallLog",
-                  "Microsoft-HealthStateChange",
-                  "Microsoft-Heartbeat",
                   "Microsoft-InsightsMetrics",
-                  "Microsoft-OperationLog",
                   "Microsoft-Perf",
-                  "Microsoft-ProcessInvestigator",
-                  "Microsoft-ProtectionStatus",
-                  "Microsoft-RomeDetectionEvent",
-                  "Microsoft-SecurityBaseline",
-                  "Microsoft-SecurityBaselineSummary",
-                  "Microsoft-SecurityEvent",
                   "Microsoft-Syslog",
                   "Microsoft-WindowsEvent"
                 ]
@@ -342,50 +313,23 @@
           "description": "List of streams for this data flow."
         }
       },
-      "required": [
-        "destinations",
-        "streams"
-      ],
       "description": "Definition of which streams are sent to which destinations."
     },
     "DestinationsSpecAzureMonitorMetrics": {
       "type": "object",
       "properties": {
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 0,
-              "maxLength": 32
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
           "description": "A friendly name for the destination. \r\nThis name should be unique across all destinations (regardless of type) within the data collection rule."
         }
       },
-      "required": [
-        "name"
-      ],
       "description": "Azure Monitor Metrics destination."
     },
     "ExtensionDataSource": {
       "type": "object",
       "properties": {
         "extensionName": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 0,
-              "maxLength": 64
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
           "description": "The name of the VM extension."
         },
         "extensionSettings": {
@@ -393,18 +337,22 @@
           "properties": {},
           "description": "The extension settings. The format is specific for particular extension."
         },
-        "name": {
+        "inputDataSources": {
           "oneOf": [
             {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 0,
-              "maxLength": 32
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
+          "description": "The list of data sources this extension needs data from."
+        },
+        "name": {
+          "type": "string",
           "description": "A friendly name for the data source. \r\nThis name should be unique across all data sources (regardless of type) within the data collection rule."
         },
         "streams": {
@@ -414,24 +362,9 @@
               "items": {
                 "type": "string",
                 "enum": [
-                  "Microsoft-AntiMalwareStatus",
-                  "Microsoft-Auditd",
-                  "Microsoft-CISCOASA",
-                  "Microsoft-CommonSecurityLog",
-                  "Microsoft-ComputerGroup",
                   "Microsoft-Event",
-                  "Microsoft-FirewallLog",
-                  "Microsoft-HealthStateChange",
-                  "Microsoft-Heartbeat",
                   "Microsoft-InsightsMetrics",
-                  "Microsoft-OperationLog",
                   "Microsoft-Perf",
-                  "Microsoft-ProcessInvestigator",
-                  "Microsoft-ProtectionStatus",
-                  "Microsoft-RomeDetectionEvent",
-                  "Microsoft-SecurityBaseline",
-                  "Microsoft-SecurityBaselineSummary",
-                  "Microsoft-SecurityEvent",
                   "Microsoft-Syslog",
                   "Microsoft-WindowsEvent"
                 ]
@@ -445,9 +378,7 @@
         }
       },
       "required": [
-        "extensionName",
-        "name",
-        "streams"
+        "extensionName"
       ],
       "description": "Definition of which data will be collected from a separate VM extension that integrates with the Azure Monitor Agent.\r\nCollected from either Windows and Linux machines, depending on which extension is defined."
     },
@@ -455,17 +386,7 @@
       "type": "object",
       "properties": {
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 0,
-              "maxLength": 32
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
           "description": "A friendly name for the destination. \r\nThis name should be unique across all destinations (regardless of type) within the data collection rule."
         },
         "workspaceResourceId": {
@@ -473,10 +394,6 @@
           "description": "The resource ID of the Log Analytics workspace."
         }
       },
-      "required": [
-        "name",
-        "workspaceResourceId"
-      ],
       "description": "Log Analytics destination."
     },
     "PerfCounterDataSource": {
@@ -497,25 +414,13 @@
           "description": "A list of specifier names of the performance counters you want to collect.\r\nUse a wildcard (*) to collect a counter for all instances.\r\nTo get a list of performance counters on Windows, run the command 'typeperf'."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 0,
-              "maxLength": 32
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
           "description": "A friendly name for the data source. \r\nThis name should be unique across all data sources (regardless of type) within the data collection rule."
         },
         "samplingFrequencyInSeconds": {
           "oneOf": [
             {
-              "type": "integer",
-              "minimum": 1,
-              "maximum": 30
+              "type": "integer"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -523,24 +428,6 @@
           ],
           "description": "The number of seconds between consecutive counter measurements (samples)."
         },
-        "scheduledTransferPeriod": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "PT1M",
-                "PT5M",
-                "PT15M",
-                "PT30M",
-                "PT60M"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The interval between data uploads (scheduled transfers), rounded up to the nearest minute."
-        },
         "streams": {
           "oneOf": [
             {
@@ -560,13 +447,6 @@
           "description": "List of streams that this data source will be sent to.\r\nA stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to."
         }
       },
-      "required": [
-        "counterSpecifiers",
-        "name",
-        "samplingFrequencyInSeconds",
-        "scheduledTransferPeriod",
-        "streams"
-      ],
       "description": "Definition of which performance counters will be collected and how they will be collected by this data collection rule.\r\nCollected from both Windows and Linux machines where the counter is present."
     },
     "SyslogDataSource": {
@@ -590,7 +470,7 @@
                   "news",
                   "syslog",
                   "user",
-                  "UUCP",
+                  "uucp",
                   "local0",
                   "local1",
                   "local2",
@@ -598,7 +478,8 @@
                   "local4",
                   "local5",
                   "local6",
-                  "local7"
+                  "local7",
+                  "*"
                 ]
               }
             },
@@ -622,7 +503,8 @@
                   "Error",
                   "Critical",
                   "Alert",
-                  "Emergency"
+                  "Emergency",
+                  "*"
                 ]
               }
             },
@@ -633,17 +515,7 @@
           "description": "The log levels to collect."
         },
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 0,
-              "maxLength": 32
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
           "description": "A friendly name for the data source. \r\nThis name should be unique across all data sources (regardless of type) within the data collection rule."
         },
         "streams": {
@@ -664,48 +536,15 @@
           "description": "List of streams that this data source will be sent to.\r\nA stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to."
         }
       },
-      "required": [
-        "facilityNames",
-        "name",
-        "streams"
-      ],
       "description": "Definition of which syslog data will be collected and how it will be collected.\r\nOnly collected from Linux machines."
     },
     "WindowsEventLogDataSource": {
       "type": "object",
       "properties": {
         "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[-\\w\\._\\(\\)]+$",
-              "minLength": 0,
-              "maxLength": 32
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
+          "type": "string",
           "description": "A friendly name for the data source. \r\nThis name should be unique across all data sources (regardless of type) within the data collection rule."
         },
-        "scheduledTransferPeriod": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "PT1M",
-                "PT5M",
-                "PT15M",
-                "PT30M",
-                "PT60M"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The interval between data uploads (scheduled transfers), rounded up to the nearest minute."
-        },
         "streams": {
           "oneOf": [
             {
@@ -739,12 +578,6 @@
           "description": "A list of Windows Event Log queries in XPATH format."
         }
       },
-      "required": [
-        "name",
-        "scheduledTransferPeriod",
-        "streams",
-        "xPathQueries"
-      ],
       "description": "Definition of which Windows Event Log events will be collected and how they will be collected.\r\nOnly collected from Windows machines."
     }
   }
diff --git a/schemas/2019-11-04-preview/Microsoft.Quantum.json b/schemas/2019-11-04-preview/Microsoft.Quantum.json
index e7afab8786..6bfbfa39f2 100644
--- a/schemas/2019-11-04-preview/Microsoft.Quantum.json
+++ b/schemas/2019-11-04-preview/Microsoft.Quantum.json
@@ -79,6 +79,10 @@
     "Provider": {
       "type": "object",
       "properties": {
+        "applicationName": {
+          "type": "string",
+          "description": "The provider's marketplace application display name."
+        },
         "instanceUri": {
           "type": "string",
           "description": "A Uri identifying the specific instance of this provider."
@@ -109,6 +113,10 @@
             }
           ],
           "description": "Provisioning status field."
+        },
+        "resourceUsageId": {
+          "type": "string",
+          "description": "Id to track resource usage for the provider."
         }
       },
       "description": "Information about a Provider. A Provider is an entity that offers Targets to run Azure Quantum Jobs."
diff --git a/schemas/2020-02-02-preview/Microsoft.Sql.json b/schemas/2020-02-02-preview/Microsoft.Sql.json
index f63e81a5f9..5679902594 100644
--- a/schemas/2020-02-02-preview/Microsoft.Sql.json
+++ b/schemas/2020-02-02-preview/Microsoft.Sql.json
@@ -5872,6 +5872,56 @@
     "SecurityAlertsPolicyProperties": {
       "type": "object",
       "properties": {
+        "disabledAlerts": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action"
+        },
+        "emailAccountAdmins": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies that the alert is sent to the account administrators."
+        },
+        "emailAddresses": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies an array of e-mail addresses to which the alert is sent."
+        },
+        "retentionDays": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies the number of days to keep in the Threat Detection audit logs."
+        },
         "state": {
           "oneOf": [
             {
@@ -5886,6 +5936,14 @@
             }
           ],
           "description": "Specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database."
+        },
+        "storageAccountAccessKey": {
+          "type": "string",
+          "description": "Specifies the identifier key of the Threat Detection audit storage account."
+        },
+        "storageEndpoint": {
+          "type": "string",
+          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs."
         }
       },
       "required": [
diff --git a/schemas/2020-06-01/Microsoft.EventGrid.json b/schemas/2020-06-01/Microsoft.EventGrid.json
index 1466ec9ba4..3f7a575059 100644
--- a/schemas/2020-06-01/Microsoft.EventGrid.json
+++ b/schemas/2020-06-01/Microsoft.EventGrid.json
@@ -512,20 +512,6 @@
           ],
           "description": "By default, Event Grid expects events to be in the Event Grid event schema. Specifying an input schema mapping enables publishing to Event Grid using a custom input schema. Currently, the only supported type of InputSchemaMapping is 'JsonInputSchemaMapping'."
         },
-        "privateEndpointConnections": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/PrivateEndpointConnection"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "List of private endpoint connections."
-        },
         "publicNetworkAccess": {
           "oneOf": [
             {
@@ -1176,22 +1162,6 @@
       },
       "description": "PrivateEndpoint information."
     },
-    "PrivateEndpointConnection": {
-      "type": "object",
-      "properties": {
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PrivateEndpointConnectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of the private endpoint connection resource."
-        }
-      }
-    },
     "PrivateEndpointConnectionProperties": {
       "type": "object",
       "properties": {
@@ -1624,19 +1594,6 @@
           ],
           "description": "By default, Event Grid expects events to be in the Event Grid event schema. Specifying an input schema mapping enables publishing to Event Grid using a custom input schema. Currently, the only supported type of InputSchemaMapping is 'JsonInputSchemaMapping'."
         },
-        "privateEndpointConnections": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/PrivateEndpointConnection"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
         "publicNetworkAccess": {
           "oneOf": [
             {
diff --git a/schemas/2020-08-01-preview/Microsoft.Sql.json b/schemas/2020-08-01-preview/Microsoft.Sql.json
index ece576cb5b..71142a2298 100644
--- a/schemas/2020-08-01-preview/Microsoft.Sql.json
+++ b/schemas/2020-08-01-preview/Microsoft.Sql.json
@@ -5999,6 +5999,56 @@
     "SecurityAlertsPolicyProperties": {
       "type": "object",
       "properties": {
+        "disabledAlerts": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action"
+        },
+        "emailAccountAdmins": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies that the alert is sent to the account administrators."
+        },
+        "emailAddresses": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies an array of e-mail addresses to which the alert is sent."
+        },
+        "retentionDays": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies the number of days to keep in the Threat Detection audit logs."
+        },
         "state": {
           "oneOf": [
             {
@@ -6013,6 +6063,14 @@
             }
           ],
           "description": "Specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database."
+        },
+        "storageAccountAccessKey": {
+          "type": "string",
+          "description": "Specifies the identifier key of the Threat Detection audit storage account."
+        },
+        "storageEndpoint": {
+          "type": "string",
+          "description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). This blob storage will hold all Threat Detection audit logs."
         }
       },
       "required": [
diff --git a/schemas/2020-08-06-preview/Microsoft.Security.json b/schemas/2020-08-06-preview/Microsoft.Security.json
index 888b3c24f1..155faebabc 100644
--- a/schemas/2020-08-06-preview/Microsoft.Security.json
+++ b/schemas/2020-08-06-preview/Microsoft.Security.json
@@ -172,6 +172,21 @@
           ],
           "description": "Size of the device quota (as a opposed to a Pay as You Go billing model). Value is required to be in multiples of 1000."
         },
+        "onboardingKind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Default",
+                "MigratedToAzure"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The kind of onboarding for the subscription."
+        },
         "sentinelWorkspaceResourceIds": {
           "oneOf": [
             {
@@ -189,6 +204,7 @@
       },
       "required": [
         "deviceQuota",
+        "onboardingKind",
         "sentinelWorkspaceResourceIds"
       ],
       "description": "IoT Defender settings properties"
@@ -196,16 +212,20 @@
     "IotSensorProperties": {
       "type": "object",
       "properties": {
-        "isEnterpriseSensor": {
+        "sensorType": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "string",
+              "enum": [
+                "Ot",
+                "Enterprise"
+              ]
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Is type of sensor is enterprise IoT sensor"
+          "description": "Type of sensor."
         },
         "tiAutomaticUpdates": {
           "oneOf": [
diff --git a/schemas/2020-08-20/Microsoft.Communication.json b/schemas/2020-08-20/Microsoft.Communication.json
new file mode 100644
index 0000000000..d673835a0c
--- /dev/null
+++ b/schemas/2020-08-20/Microsoft.Communication.json
@@ -0,0 +1,160 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2020-08-20/Microsoft.Communication.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Communication",
+  "description": "Microsoft Communication Resource Types",
+  "resourceDefinitions": {
+    "communicationServices": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-20"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "The Azure location where the CommunicationService is running."
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[-\\w]+$",
+              "minLength": 1,
+              "maxLength": 63
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the CommunicationService resource."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CommunicationServiceProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A class that describes the properties of the CommunicationService."
+        },
+        "systemData": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SystemData"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata pertaining to creation and last modification of the resource."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags of the service which is a list of key value pairs that describe the resource."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Communication/communicationServices"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Communication/communicationServices"
+    }
+  },
+  "definitions": {
+    "CommunicationServiceProperties": {
+      "type": "object",
+      "properties": {
+        "dataLocation": {
+          "type": "string",
+          "description": "The location where the communication service stores its data at rest."
+        }
+      },
+      "required": [
+        "dataLocation"
+      ],
+      "description": "A class that describes the properties of the CommunicationService."
+    },
+    "SystemData": {
+      "type": "object",
+      "properties": {
+        "createdAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The timestamp of resource creation (UTC)."
+        },
+        "createdBy": {
+          "type": "string",
+          "description": "The identity that created the resource."
+        },
+        "createdByType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "User",
+                "Application",
+                "ManagedIdentity",
+                "Key"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of identity that created the resource."
+        },
+        "lastModifiedAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The timestamp of resource last modification (UTC)"
+        },
+        "lastModifiedBy": {
+          "type": "string",
+          "description": "The identity that last modified the resource."
+        },
+        "lastModifiedByType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "User",
+                "Application",
+                "ManagedIdentity",
+                "Key"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of identity that last modified the resource."
+        }
+      },
+      "description": "Metadata pertaining to creation and last modification of the resource."
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/2020-09-08-preview/Microsoft.AzureData.json b/schemas/2020-09-08-preview/Microsoft.AzureData.json
deleted file mode 100644
index ddd72fd132..0000000000
--- a/schemas/2020-09-08-preview/Microsoft.AzureData.json
+++ /dev/null
@@ -1,402 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2020-09-08-preview/Microsoft.AzureData.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.AzureData",
-  "description": "Microsoft AzureData Resource Types",
-  "resourceDefinitions": {
-    "dataControllers": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-09-08-preview"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "type": "string"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/DataControllerProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The data controller 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.AzureData/dataControllers"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.AzureData/dataControllers"
-    },
-    "postgresInstances": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-09-08-preview"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of PostgresInstance"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PostgresInstanceProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Postgres Instance 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.AzureData/postgresInstances"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.AzureData/postgresInstances"
-    },
-    "sqlManagedInstances": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-09-08-preview"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of SQL Managed Instances"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SqlManagedInstanceProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of sqlManagedInstance."
-        },
-        "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.AzureData/sqlManagedInstances"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.AzureData/sqlManagedInstances"
-    },
-    "sqlServerInstances": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-09-08-preview"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of SQL Server Instance"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SqlServerInstanceProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of SqlServerInstance."
-        },
-        "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.AzureData/sqlServerInstances"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.AzureData/sqlServerInstances"
-    }
-  },
-  "definitions": {
-    "DataControllerProperties": {
-      "type": "object",
-      "properties": {
-        "k8sRaw": {
-          "type": "object",
-          "properties": {},
-          "description": "The raw kubernetes information"
-        },
-        "lastUploadedDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Last uploaded date from on premise cluster. Defaults to current date time"
-        },
-        "onPremiseProperty": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/OnPremiseProperty"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties from the on premise data controller"
-        }
-      },
-      "required": [
-        "onPremiseProperty"
-      ],
-      "description": "The data controller properties."
-    },
-    "OnPremiseProperty": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A globally unique ID identifying the associated on premise cluster"
-        },
-        "publicSigningKey": {
-          "type": "string",
-          "description": "Certificate that contains the on premise cluster public key used to verify signing"
-        },
-        "signingCertificateThumbprint": {
-          "type": "string",
-          "description": "Unique thumbprint returned to customer to verify the certificate being uploaded"
-        }
-      },
-      "required": [
-        "id",
-        "publicSigningKey"
-      ],
-      "description": "Properties from the on premise data controller"
-    },
-    "PostgresInstanceProperties": {
-      "type": "object",
-      "properties": {
-        "admin": {
-          "type": "string",
-          "description": "The instance admin"
-        },
-        "dataControllerId": {
-          "type": "string",
-          "description": "The data controller id"
-        },
-        "k8sRaw": {
-          "type": "object",
-          "properties": {},
-          "description": "The raw kubernetes information"
-        },
-        "lastUploadedDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Last uploaded date from on premise cluster. Defaults to current date time"
-        }
-      },
-      "description": "Postgres Instance properties."
-    },
-    "SqlManagedInstanceProperties": {
-      "type": "object",
-      "properties": {
-        "admin": {
-          "type": "string",
-          "description": "The instance admin user"
-        },
-        "dataControllerId": {
-          "type": "string",
-          "description": "null"
-        },
-        "endTime": {
-          "type": "string",
-          "description": "The instance end time"
-        },
-        "instanceEndpoint": {
-          "type": "string",
-          "description": "The on premise instance endpoint"
-        },
-        "k8sRaw": {
-          "type": "object",
-          "properties": {},
-          "description": "The raw kubernetes information"
-        },
-        "lastUploadedDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Last uploaded date from on premise cluster. Defaults to current date time"
-        },
-        "startTime": {
-          "type": "string",
-          "description": "The instance start time"
-        },
-        "vCore": {
-          "type": "string",
-          "description": "The instance vCore"
-        }
-      },
-      "description": "Properties of sqlManagedInstance."
-    },
-    "SqlServerInstanceProperties": {
-      "type": "object",
-      "properties": {
-        "containerResourceId": {
-          "type": "string",
-          "description": "ARM Resource id of the container resource (Azure Arc for Servers)"
-        },
-        "edition": {
-          "type": "string",
-          "description": "SQL Server edition."
-        },
-        "status": {
-          "type": "string",
-          "description": "The cloud connectivity status."
-        },
-        "vCore": {
-          "type": "string",
-          "description": "The number of logical processors used by the SQL Server instance."
-        },
-        "version": {
-          "type": "string",
-          "description": "SQL Server version."
-        }
-      },
-      "required": [
-        "containerResourceId",
-        "edition",
-        "status",
-        "vCore",
-        "version"
-      ],
-      "description": "Properties of SqlServerInstance."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2020-10-15-preview/Microsoft.EventGrid.json b/schemas/2020-10-15-preview/Microsoft.EventGrid.json
index f3cd433f7f..768a4c9f25 100644
--- a/schemas/2020-10-15-preview/Microsoft.EventGrid.json
+++ b/schemas/2020-10-15-preview/Microsoft.EventGrid.json
@@ -1016,20 +1016,6 @@
           ],
           "description": "By default, Event Grid expects events to be in the Event Grid event schema. Specifying an input schema mapping enables publishing to Event Grid using a custom input schema. Currently, the only supported type of InputSchemaMapping is 'JsonInputSchemaMapping'."
         },
-        "privateEndpointConnections": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/PrivateEndpointConnection"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "List of private endpoint connections."
-        },
         "publicNetworkAccess": {
           "oneOf": [
             {
@@ -2188,22 +2174,6 @@
       },
       "description": "PrivateEndpoint information."
     },
-    "PrivateEndpointConnection": {
-      "type": "object",
-      "properties": {
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PrivateEndpointConnectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of the private endpoint connection resource."
-        }
-      }
-    },
     "PrivateEndpointConnectionProperties": {
       "type": "object",
       "properties": {
@@ -2883,19 +2853,6 @@
           ],
           "description": "By default, Event Grid expects events to be in the Event Grid event schema. Specifying an input schema mapping enables publishing to Event Grid using a custom input schema. Currently, the only supported type of InputSchemaMapping is 'JsonInputSchemaMapping'."
         },
-        "privateEndpointConnections": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/PrivateEndpointConnection"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
         "publicNetworkAccess": {
           "oneOf": [
             {
diff --git a/schemas/2020-10-20/Microsoft.Insights.Application.json b/schemas/2020-10-20/Microsoft.Insights.Application.json
index a9dedd9123..8747c3e633 100644
--- a/schemas/2020-10-20/Microsoft.Insights.Application.json
+++ b/schemas/2020-10-20/Microsoft.Insights.Application.json
@@ -138,7 +138,7 @@
         "identity": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ManagedIdentity"
+              "$ref": "#/definitions/ManagedIdentityModel"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -244,6 +244,38 @@
       },
       "description": "Customer Managed Identity"
     },
+    "ManagedIdentityModel": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "UserAssigned",
+                "None"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The identity type."
+        },
+        "userAssignedIdentities": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UserAssignedIdentitiesModel"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Customer Managed Identity"
+        }
+      },
+      "description": "Customer Managed Identity"
+    },
     "MyWorkbookProperties": {
       "type": "object",
       "properties": {
@@ -298,6 +330,11 @@
       "properties": {},
       "description": "Customer Managed Identity"
     },
+    "UserAssignedIdentitiesModel": {
+      "type": "object",
+      "properties": {},
+      "description": "Customer Managed Identity"
+    },
     "WorkbookProperties": {
       "type": "object",
       "properties": {
diff --git a/schemas/2020-10-30-preview/Microsoft.PowerPlatform.json b/schemas/2020-10-30-preview/Microsoft.PowerPlatform.json
index b73285640f..06b72d4e95 100644
--- a/schemas/2020-10-30-preview/Microsoft.PowerPlatform.json
+++ b/schemas/2020-10-30-preview/Microsoft.PowerPlatform.json
@@ -24,6 +24,10 @@
           ],
           "description": "The identity of the EnterprisePolicy."
         },
+        "location": {
+          "type": "string",
+          "description": "The geo-location where the resource lives"
+        },
         "name": {
           "type": "string",
           "description": "Name of the EnterprisePolicy."
@@ -52,6 +56,17 @@
             ]
           }
         },
+        "systemData": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SystemData"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata pertaining to creation and last modification of the resource."
+        },
         "tags": {
           "oneOf": [
             {
@@ -76,6 +91,7 @@
       },
       "required": [
         "apiVersion",
+        "location",
         "name",
         "properties",
         "type"
@@ -106,6 +122,17 @@
           ],
           "description": "Properties of the PrivateEndpointConnectProperties."
         },
+        "systemData": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SystemData"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata pertaining to creation and last modification of the resource."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -174,6 +201,17 @@
           ],
           "description": "Properties of the PrivateEndpointConnectProperties."
         },
+        "systemData": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SystemData"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata pertaining to creation and last modification of the resource."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -395,17 +433,6 @@
             }
           ],
           "description": "Settings concerning lockbox."
-        },
-        "systemData": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SystemData"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Metadata pertaining to creation and last modification of the resource."
         }
       },
       "description": "The properties that define configuration for the enterprise policy."
diff --git a/schemas/2020-12-01/Microsoft.ApiManagement.json b/schemas/2020-12-01/Microsoft.ApiManagement.json
index a7ef1a37c2..bbeb0e0854 100644
--- a/schemas/2020-12-01/Microsoft.ApiManagement.json
+++ b/schemas/2020-12-01/Microsoft.ApiManagement.json
@@ -2354,7 +2354,7 @@
               "type": "string",
               "enum": [
                 "access",
-                "getAccess"
+                "gitAccess"
               ]
             },
             {
@@ -7301,7 +7301,7 @@
               "type": "string",
               "enum": [
                 "access",
-                "getAccess"
+                "gitAccess"
               ]
             },
             {
diff --git a/schemas/2020-12-01/Microsoft.NetApp.json b/schemas/2020-12-01/Microsoft.NetApp.json
new file mode 100644
index 0000000000..f8c7ba7e47
--- /dev/null
+++ b/schemas/2020-12-01/Microsoft.NetApp.json
@@ -0,0 +1,1973 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2020-12-01/Microsoft.NetApp.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.NetApp",
+  "description": "Microsoft NetApp Resource Types",
+  "resourceDefinitions": {
+    "netAppAccounts": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the NetApp account"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccountProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "NetApp account properties"
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/netAppAccounts_capacityPools_childResource"
+              },
+              {
+                "$ref": "#/definitions/netAppAccounts_snapshotPolicies_childResource"
+              },
+              {
+                "$ref": "#/definitions/netAppAccounts_backupPolicies_childResource"
+              }
+            ]
+          }
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags are a list of key-value pairs that describe the resource"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.NetApp/netAppAccounts"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts"
+    },
+    "netAppAccounts_backupPolicies": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "Backup policy Name which uniquely identify backup policy."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/BackupPolicyProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Backup policy properties"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags are a list of key-value pairs that describe the resource"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.NetApp/netAppAccounts/backupPolicies"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/backupPolicies"
+    },
+    "netAppAccounts_capacityPools": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,63}$",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the capacity pool"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PoolProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Pool properties"
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/netAppAccounts_capacityPools_volumes_childResource"
+              }
+            ]
+          }
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags are a list of key-value pairs that describe the resource"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.NetApp/netAppAccounts/capacityPools"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/capacityPools"
+    },
+    "netAppAccounts_capacityPools_volumes": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z][a-zA-Z0-9\\-_]{0,63}$",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the volume"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VolumeProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Volume properties"
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/netAppAccounts_capacityPools_volumes_snapshots_childResource"
+              },
+              {
+                "$ref": "#/definitions/netAppAccounts_capacityPools_volumes_backups_childResource"
+              }
+            ]
+          }
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags are a list of key-value pairs that describe the resource"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.NetApp/netAppAccounts/capacityPools/volumes"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes"
+    },
+    "netAppAccounts_capacityPools_volumes_backups": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the backup"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/BackupProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Backup properties"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups"
+    },
+    "netAppAccounts_capacityPools_volumes_snapshots": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the mount target"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SnapshotProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Snapshot properties"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots"
+    },
+    "netAppAccounts_snapshotPolicies": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the snapshot policy target"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SnapshotPolicyProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Snapshot policy properties"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags are a list of key-value pairs that describe the resource"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.NetApp/netAppAccounts/snapshotPolicies"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/snapshotPolicies"
+    }
+  },
+  "definitions": {
+    "AccountEncryption": {
+      "type": "object",
+      "properties": {
+        "keySource": {
+          "type": "string",
+          "description": "Encryption Key Source. Possible values are: 'Microsoft.NetApp'."
+        }
+      },
+      "description": "Encryption settings"
+    },
+    "AccountProperties": {
+      "type": "object",
+      "properties": {
+        "activeDirectories": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ActiveDirectory"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Active Directories"
+        },
+        "encryption": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccountEncryption"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Encryption settings"
+        }
+      },
+      "description": "NetApp account properties"
+    },
+    "ActiveDirectory": {
+      "type": "object",
+      "properties": {
+        "activeDirectoryId": {
+          "type": "string",
+          "description": "Id of the Active Directory"
+        },
+        "adName": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 64,
+          "description": "Name of the active directory machine. This optional parameter is used only while creating kerberos volume"
+        },
+        "aesEncryption": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "If enabled, AES encryption will be enabled for SMB communication."
+        },
+        "allowLocalNfsUsersWithLdap": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": " If enabled, NFS client local users can also (in addition to LDAP users) access the NFS volumes."
+        },
+        "backupOperators": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Users to be added to the Built-in Backup Operator active directory group. A list of unique usernames without domain specifier"
+        },
+        "dns": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)((, ?)(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))*$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Comma separated list of DNS server IP addresses (IPv4 only) for the Active Directory domain"
+        },
+        "domain": {
+          "type": "string",
+          "description": "Name of the Active Directory domain"
+        },
+        "kdcIP": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)((, ?)(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))*$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "kdc server IP addresses for the active directory machine. This optional parameter is used only while creating kerberos volume."
+        },
+        "ldapOverTLS": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies whether or not the LDAP traffic needs to be secured via TLS."
+        },
+        "ldapSigning": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies whether or not the LDAP traffic needs to be signed."
+        },
+        "organizationalUnit": {
+          "type": "string",
+          "default": "CN=Computers",
+          "description": "The Organizational Unit (OU) within the Windows Active Directory"
+        },
+        "password": {
+          "type": "string",
+          "description": "Plain text password of Active Directory domain administrator, value is masked in the response"
+        },
+        "securityOperators": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Domain Users in the Active directory to be given SeSecurityPrivilege privilege (Needed for SMB Continuously available shares for SQL). A list of unique usernames without domain specifier"
+        },
+        "serverRootCACertificate": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 10240,
+          "description": "When LDAP over SSL/TLS is enabled, the LDAP client is required to have base64 encoded Active Directory Certificate Service's self-signed root CA certificate, this optional parameter is used only for dual protocol with LDAP user-mapping volumes."
+        },
+        "site": {
+          "type": "string",
+          "description": "The Active Directory site the service will limit Domain Controller discovery to"
+        },
+        "smbServerName": {
+          "type": "string",
+          "description": "NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes"
+        },
+        "username": {
+          "type": "string",
+          "description": "Username of Active Directory domain administrator"
+        }
+      },
+      "description": "Active Directory"
+    },
+    "BackupPolicyProperties": {
+      "type": "object",
+      "properties": {
+        "dailyBackupsToKeep": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Daily backups count to keep"
+        },
+        "enabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The property to decide policy is enabled or not"
+        },
+        "monthlyBackupsToKeep": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Monthly backups count to keep"
+        },
+        "volumeBackups": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VolumeBackups"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A list of volumes assigned to this policy"
+        },
+        "volumesAssigned": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Volumes using current backup policy"
+        },
+        "weeklyBackupsToKeep": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Weekly backups count to keep"
+        },
+        "yearlyBackupsToKeep": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Yearly backups count to keep"
+        }
+      },
+      "description": "Backup policy properties"
+    },
+    "BackupProperties": {
+      "type": "object",
+      "properties": {
+        "label": {
+          "type": "string",
+          "description": "Label for backup"
+        }
+      },
+      "description": "Backup properties"
+    },
+    "DailySchedule": {
+      "type": "object",
+      "properties": {
+        "hour": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates which hour in UTC timezone a snapshot should be taken"
+        },
+        "minute": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates which minute snapshot should be taken"
+        },
+        "snapshotsToKeep": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Daily snapshot count to keep"
+        },
+        "usedBytes": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource size in bytes, current storage usage for the volume in bytes"
+        }
+      },
+      "description": "Daily Schedule properties"
+    },
+    "ExportPolicyRule": {
+      "type": "object",
+      "properties": {
+        "allowedClients": {
+          "type": "string",
+          "description": "Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names"
+        },
+        "cifs": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Allows CIFS protocol"
+        },
+        "hasRootAccess": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": true
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Has root access to volume"
+        },
+        "kerberos5iReadOnly": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Kerberos5i Read only access. To be use with swagger version 2020-05-01 or later"
+        },
+        "kerberos5iReadWrite": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Kerberos5i Read and write access. To be use with swagger version 2020-05-01 or later"
+        },
+        "kerberos5pReadOnly": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Kerberos5p Read only access. To be use with swagger version 2020-05-01 or later"
+        },
+        "kerberos5pReadWrite": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Kerberos5p Read and write access. To be use with swagger version 2020-05-01 or later"
+        },
+        "kerberos5ReadOnly": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Kerberos5 Read only access. To be use with swagger version 2020-05-01 or later"
+        },
+        "kerberos5ReadWrite": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Kerberos5 Read and write access. To be use with swagger version 2020-05-01 or later"
+        },
+        "nfsv3": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Allows NFSv3 protocol. Enable only for NFSv3 type volumes"
+        },
+        "nfsv41": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Allows NFSv4.1 protocol. Enable only for NFSv4.1 type volumes"
+        },
+        "ruleIndex": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Order index"
+        },
+        "unixReadOnly": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Read only access"
+        },
+        "unixReadWrite": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Read and write access"
+        }
+      },
+      "description": "Volume Export Policy Rule"
+    },
+    "HourlySchedule": {
+      "type": "object",
+      "properties": {
+        "minute": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates which minute snapshot should be taken"
+        },
+        "snapshotsToKeep": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Hourly snapshot count to keep"
+        },
+        "usedBytes": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource size in bytes, current storage usage for the volume in bytes"
+        }
+      },
+      "description": "Hourly Schedule properties"
+    },
+    "MonthlySchedule": {
+      "type": "object",
+      "properties": {
+        "daysOfMonth": {
+          "type": "string",
+          "description": "Indicates which days of the month snapshot should be taken. A comma delimited string."
+        },
+        "hour": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates which hour in UTC timezone a snapshot should be taken"
+        },
+        "minute": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates which minute snapshot should be taken"
+        },
+        "snapshotsToKeep": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Monthly snapshot count to keep"
+        },
+        "usedBytes": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource size in bytes, current storage usage for the volume in bytes"
+        }
+      },
+      "description": "Monthly Schedule properties"
+    },
+    "netAppAccounts_backupPolicies_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "Backup policy Name which uniquely identify backup policy."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/BackupPolicyProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Backup policy properties"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags are a list of key-value pairs that describe the resource"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "backupPolicies"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/backupPolicies"
+    },
+    "netAppAccounts_capacityPools_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,63}$",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the capacity pool"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PoolProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Pool properties"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags are a list of key-value pairs that describe the resource"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "capacityPools"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/capacityPools"
+    },
+    "netAppAccounts_capacityPools_volumes_backups_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the backup"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/BackupProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Backup properties"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "backups"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups"
+    },
+    "netAppAccounts_capacityPools_volumes_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z][a-zA-Z0-9\\-_]{0,63}$",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the volume"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VolumeProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Volume properties"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags are a list of key-value pairs that describe the resource"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "volumes"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes"
+    },
+    "netAppAccounts_capacityPools_volumes_snapshots_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the mount target"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SnapshotProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Snapshot properties"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "snapshots"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots"
+    },
+    "netAppAccounts_snapshotPolicies_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the snapshot policy target"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SnapshotPolicyProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Snapshot policy properties"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags are a list of key-value pairs that describe the resource"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "snapshotPolicies"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.NetApp/netAppAccounts/snapshotPolicies"
+    },
+    "PoolProperties": {
+      "type": "object",
+      "properties": {
+        "qosType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Auto",
+                "Manual"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The qos type of the pool."
+        },
+        "serviceLevel": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard",
+                "Premium",
+                "Ultra"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The service level of the file system."
+        },
+        "size": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 4398046511104,
+              "maximum": 549755813888000
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104)."
+        }
+      },
+      "required": [
+        "serviceLevel",
+        "size"
+      ],
+      "description": "Pool properties"
+    },
+    "ReplicationObject": {
+      "type": "object",
+      "properties": {
+        "endpointType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "src",
+                "dst"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates whether the local volume is the source or destination for the Volume Replication."
+        },
+        "remoteVolumeRegion": {
+          "type": "string",
+          "description": "The remote region for the other end of the Volume Replication."
+        },
+        "remoteVolumeResourceId": {
+          "type": "string",
+          "description": "The resource ID of the remote volume."
+        },
+        "replicationId": {
+          "type": "string",
+          "description": "Id"
+        },
+        "replicationSchedule": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "_10minutely",
+                "hourly",
+                "daily"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Schedule."
+        }
+      },
+      "required": [
+        "remoteVolumeResourceId",
+        "replicationSchedule"
+      ],
+      "description": "Replication properties"
+    },
+    "SnapshotPolicyProperties": {
+      "type": "object",
+      "properties": {
+        "dailySchedule": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DailySchedule"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Daily Schedule properties"
+        },
+        "enabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The property to decide policy is enabled or not"
+        },
+        "hourlySchedule": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HourlySchedule"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Hourly Schedule properties"
+        },
+        "monthlySchedule": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MonthlySchedule"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Monthly Schedule properties"
+        },
+        "weeklySchedule": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WeeklySchedule"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Weekly Schedule properties, make a snapshot every week at a specific day or days"
+        }
+      },
+      "description": "Snapshot policy properties"
+    },
+    "SnapshotProperties": {
+      "type": "object",
+      "properties": {},
+      "description": "Snapshot properties"
+    },
+    "VolumeBackupProperties": {
+      "type": "object",
+      "properties": {
+        "backupEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Backup Enabled"
+        },
+        "backupPolicyId": {
+          "type": "string",
+          "description": "Backup Policy Resource ID"
+        },
+        "policyEnforced": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Policy Enforced"
+        },
+        "vaultId": {
+          "type": "string",
+          "description": "Vault Resource ID"
+        }
+      },
+      "description": "Volume Backup Properties"
+    },
+    "VolumeBackups": {
+      "type": "object",
+      "properties": {
+        "backupsCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Total count of backups for volume"
+        },
+        "policyEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Policy enabled"
+        },
+        "volumeName": {
+          "type": "string",
+          "description": "Volume name"
+        }
+      },
+      "description": "Volume details using the backup policy"
+    },
+    "VolumeProperties": {
+      "type": "object",
+      "properties": {
+        "backupId": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}|(\\\\?([^\\/]*[\\/])*)([^\\/]+)$",
+              "minLength": 36,
+              "maxLength": 36
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "UUID v4 or resource identifier used to identify the Backup."
+        },
+        "creationToken": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z][a-zA-Z0-9\\-]{0,79}$",
+              "minLength": 1,
+              "maxLength": 80
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "A unique file path for the volume. Used when creating mount targets"
+        },
+        "dataProtection": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VolumePropertiesDataProtection"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "DataProtection type volumes include an object containing details of the replication"
+        },
+        "encryptionKeySource": {
+          "type": "string",
+          "description": "Encryption Key Source. Possible values are: 'Microsoft.NetApp'"
+        },
+        "exportPolicy": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VolumePropertiesExportPolicy"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Set of export policy rules"
+        },
+        "isRestoring": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Restoring"
+        },
+        "kerberosEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Describe if a volume is KerberosEnabled. To be use with swagger version 2020-05-01 or later"
+        },
+        "ldapEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies whether LDAP is enabled or not for a given NFS volume."
+        },
+        "protocolTypes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Set of protocol types, default NFSv3, CIFS fro SMB protocol"
+        },
+        "securityStyle": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "ntfs",
+                "unix"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The security style of volume, default unix, defaults to ntfs for dual protocol or CIFS protocol."
+        },
+        "serviceLevel": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard",
+                "Premium",
+                "Ultra"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The service level of the file system."
+        },
+        "smbContinuouslyAvailable": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enables continuously available share property for smb volume. Only applicable for SMB volume"
+        },
+        "smbEncryption": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": false
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enables encryption for in-flight smb3 data. Only applicable for SMB/DualProtocol volume. To be used with swagger version 2020-08-01 or later"
+        },
+        "snapshotDirectoryVisible": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "default": true
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "If enabled (true) the volume will contain a read-only snapshot directory which provides access to each of the volume's snapshots (default to true)."
+        },
+        "snapshotId": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}|(\\\\?([^\\/]*[\\/])*)([^\\/]+)$",
+              "minLength": 36,
+              "maxLength": 36
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "UUID v4 or resource identifier used to identify the Snapshot."
+        },
+        "subnetId": {
+          "type": "string",
+          "description": "The Azure Resource URI for a delegated subnet. Must have the delegation Microsoft.NetApp/volumes"
+        },
+        "throughputMibps": {
+          "oneOf": [
+            {
+              "type": "number",
+              "minimum": 0,
+              "maximum": 4500,
+              "default": 0
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "usageThreshold": {
+          "oneOf": [
+            {
+              "type": "integer",
+              "minimum": 107374182400,
+              "maximum": 109951162777600,
+              "default": "107374182400"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB. Specified in bytes."
+        },
+        "volumeType": {
+          "type": "string",
+          "description": "What type of volume is this"
+        }
+      },
+      "required": [
+        "creationToken",
+        "subnetId",
+        "usageThreshold"
+      ],
+      "description": "Volume properties"
+    },
+    "VolumePropertiesDataProtection": {
+      "type": "object",
+      "properties": {
+        "backup": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VolumeBackupProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Volume Backup Properties"
+        },
+        "replication": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ReplicationObject"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Replication properties"
+        },
+        "snapshot": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VolumeSnapshotProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Volume Snapshot Properties"
+        }
+      },
+      "description": "DataProtection type volumes include an object containing details of the replication"
+    },
+    "VolumePropertiesExportPolicy": {
+      "type": "object",
+      "properties": {
+        "rules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ExportPolicyRule"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Export policy rule"
+        }
+      },
+      "description": "Set of export policy rules"
+    },
+    "VolumeSnapshotProperties": {
+      "type": "object",
+      "properties": {
+        "snapshotPolicyId": {
+          "type": "string",
+          "description": "Snapshot Policy ResourceId"
+        }
+      },
+      "description": "Volume Snapshot Properties"
+    },
+    "WeeklySchedule": {
+      "type": "object",
+      "properties": {
+        "day": {
+          "type": "string",
+          "description": "Indicates which weekdays snapshot should be taken, accepts a comma separated list of week day names in english"
+        },
+        "hour": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates which hour in UTC timezone a snapshot should be taken"
+        },
+        "minute": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates which minute snapshot should be taken"
+        },
+        "snapshotsToKeep": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Weekly snapshot count to keep"
+        },
+        "usedBytes": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource size in bytes, current storage usage for the volume in bytes"
+        }
+      },
+      "description": "Weekly Schedule properties, make a snapshot every week at a specific day or days"
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/2021-01-01/Microsoft.RecoveryServices.json b/schemas/2021-01-01/Microsoft.RecoveryServices.json
new file mode 100644
index 0000000000..22d760e48a
--- /dev/null
+++ b/schemas/2021-01-01/Microsoft.RecoveryServices.json
@@ -0,0 +1,589 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.RecoveryServices.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.RecoveryServices",
+  "description": "Microsoft RecoveryServices Resource Types",
+  "resourceDefinitions": {
+    "vaults": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-01-01"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Optional ETag."
+        },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/IdentityData"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Identity for the resource."
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location."
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the recovery services vault."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VaultProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties of the vault."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/vaults_certificates_childResource"
+              },
+              {
+                "$ref": "#/definitions/vaults_extendedInformation_childResource"
+              }
+            ]
+          }
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Sku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Identifies the unique system identifier for each Azure resource."
+        },
+        "systemData": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SystemData"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata pertaining to creation and last modification of the resource."
+        },
+        "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.RecoveryServices/vaults"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.RecoveryServices/vaults"
+    },
+    "vaults_certificates": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-01-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Certificate friendly name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RawCertificateData"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Raw certificate data."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.RecoveryServices/vaults/certificates"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.RecoveryServices/vaults/certificates"
+    },
+    "vaults_extendedInformation": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-01-01"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Optional ETag."
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^.*/vaultExtendedInfo$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VaultExtendedInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Vault extended information."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.RecoveryServices/vaults/extendedInformation"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.RecoveryServices/vaults/extendedInformation"
+    }
+  },
+  "definitions": {
+    "CmkKekIdentity": {
+      "type": "object",
+      "properties": {
+        "userAssignedIdentity": {
+          "type": "string",
+          "description": "The user assigned identity to be used to grant permissions in case the type of identity used is UserAssigned"
+        },
+        "useSystemAssignedIdentity": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicate that system assigned identity should be used. Mutually exclusive with 'userAssignedIdentity' field"
+        }
+      },
+      "description": "The details of the identity used for CMK"
+    },
+    "CmkKeyVaultProperties": {
+      "type": "object",
+      "properties": {
+        "keyUri": {
+          "type": "string",
+          "description": "The key uri of the Customer Managed Key"
+        }
+      },
+      "description": "The properties of the Key Vault which hosts CMK"
+    },
+    "IdentityData": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "SystemAssigned",
+                "None",
+                "UserAssigned",
+                "SystemAssigned, UserAssigned"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of managed identity used. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user-assigned identities. The type 'None' will remove any identities."
+        },
+        "userAssignedIdentities": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/UserIdentity"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The list of user-assigned identities associated with the resource. The user-assigned identity dictionary keys will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
+        }
+      },
+      "required": [
+        "type"
+      ],
+      "description": "Identity for the resource."
+    },
+    "RawCertificateData": {
+      "type": "object",
+      "properties": {
+        "authType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Invalid",
+                "ACS",
+                "AAD",
+                "AccessControlService",
+                "AzureActiveDirectory"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies the authentication type."
+        },
+        "certificate": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(?:[A-Za-z0-9+\\/]{4})*(?:[A-Za-z0-9+\\/]{2}==|[A-Za-z0-9+\\/]{3}=)?$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The base64 encoded certificate raw data string"
+        }
+      },
+      "description": "Raw certificate data."
+    },
+    "Sku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard",
+                "RS0"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The Sku name."
+        },
+        "tier": {
+          "type": "string",
+          "description": "The Sku tier."
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "Identifies the unique system identifier for each Azure resource."
+    },
+    "SystemData": {
+      "type": "object",
+      "properties": {
+        "createdAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The timestamp of resource creation (UTC)."
+        },
+        "createdBy": {
+          "type": "string",
+          "description": "The identity that created the resource."
+        },
+        "createdByType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "User",
+                "Application",
+                "ManagedIdentity",
+                "Key"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of identity that created the resource."
+        },
+        "lastModifiedAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The type of identity that last modified the resource."
+        },
+        "lastModifiedBy": {
+          "type": "string",
+          "description": "The identity that last modified the resource."
+        },
+        "lastModifiedByType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "User",
+                "Application",
+                "ManagedIdentity",
+                "Key"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of identity that last modified the resource."
+        }
+      },
+      "description": "Metadata pertaining to creation and last modification of the resource."
+    },
+    "UpgradeDetails": {
+      "type": "object",
+      "properties": {},
+      "description": "Details for upgrading vault."
+    },
+    "UserIdentity": {
+      "type": "object",
+      "properties": {},
+      "description": "A resource identity that is managed by the user of the service."
+    },
+    "VaultExtendedInfo": {
+      "type": "object",
+      "properties": {
+        "algorithm": {
+          "type": "string",
+          "description": "Algorithm for Vault ExtendedInfo"
+        },
+        "encryptionKey": {
+          "type": "string",
+          "description": "Encryption key."
+        },
+        "encryptionKeyThumbprint": {
+          "type": "string",
+          "description": "Encryption key thumbprint."
+        },
+        "integrityKey": {
+          "type": "string",
+          "description": "Integrity key."
+        }
+      },
+      "description": "Vault extended information."
+    },
+    "VaultProperties": {
+      "type": "object",
+      "properties": {
+        "encryption": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VaultPropertiesEncryption"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Customer Managed Key details of the resource."
+        },
+        "upgradeDetails": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UpgradeDetails"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Details for upgrading vault."
+        }
+      },
+      "description": "Properties of the vault."
+    },
+    "VaultPropertiesEncryption": {
+      "type": "object",
+      "properties": {
+        "infrastructureEncryption": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enabling/Disabling the Double Encryption state."
+        },
+        "kekIdentity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CmkKekIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The details of the identity used for CMK"
+        },
+        "keyVaultProperties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CmkKeyVaultProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The properties of the Key Vault which hosts CMK"
+        }
+      },
+      "description": "Customer Managed Key details of the resource."
+    },
+    "vaults_certificates_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-01-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Certificate friendly name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RawCertificateData"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Raw certificate data."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "certificates"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.RecoveryServices/vaults/certificates"
+    },
+    "vaults_extendedInformation_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-01-01"
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Optional ETag."
+        },
+        "name": {
+          "type": "string",
+          "enum": [
+            "vaultExtendedInfo"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VaultExtendedInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Vault extended information."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "extendedInformation"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.RecoveryServices/vaults/extendedInformation"
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/2021-01-14-preview/Microsoft.DesktopVirtualization.json b/schemas/2021-01-14-preview/Microsoft.DesktopVirtualization.json
index 58bfe3f737..e4b9ba9f61 100644
--- a/schemas/2021-01-14-preview/Microsoft.DesktopVirtualization.json
+++ b/schemas/2021-01-14-preview/Microsoft.DesktopVirtualization.json
@@ -13,16 +13,52 @@
             "2021-01-14-preview"
           ]
         },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[-\\w\\._,\\(\\)]+$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type.  If supported, the resource provider must validate and persist this value."
+        },
         "location": {
           "type": "string",
           "description": "The geo-location where the resource lives"
         },
+        "managedBy": {
+          "type": "string",
+          "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
+        },
         "name": {
           "type": "string",
           "minLength": 3,
           "maxLength": 64,
           "description": "The name of the application group"
         },
+        "plan": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetPlan"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "properties": {
           "oneOf": [
             {
@@ -44,6 +80,16 @@
             ]
           }
         },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "tags": {
           "oneOf": [
             {
@@ -68,7 +114,6 @@
       },
       "required": [
         "apiVersion",
-        "location",
         "name",
         "properties",
         "type"
@@ -125,16 +170,52 @@
             "2021-01-14-preview"
           ]
         },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[-\\w\\._,\\(\\)]+$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type.  If supported, the resource provider must validate and persist this value."
+        },
         "location": {
           "type": "string",
           "description": "The geo-location where the resource lives"
         },
+        "managedBy": {
+          "type": "string",
+          "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
+        },
         "name": {
           "type": "string",
           "minLength": 3,
           "maxLength": 64,
           "description": "The name of the host pool within the specified resource group"
         },
+        "plan": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetPlan"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "properties": {
           "oneOf": [
             {
@@ -156,6 +237,16 @@
             ]
           }
         },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "tags": {
           "oneOf": [
             {
@@ -180,7 +271,6 @@
       },
       "required": [
         "apiVersion",
-        "location",
         "name",
         "properties",
         "type"
@@ -237,16 +327,52 @@
             "2021-01-14-preview"
           ]
         },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[-\\w\\._,\\(\\)]+$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type.  If supported, the resource provider must validate and persist this value."
+        },
         "location": {
           "type": "string",
           "description": "The geo-location where the resource lives"
         },
+        "managedBy": {
+          "type": "string",
+          "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
+        },
         "name": {
           "type": "string",
           "minLength": 3,
           "maxLength": 24,
           "description": "The name of the scaling plan."
         },
+        "plan": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetPlan"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "properties": {
           "oneOf": [
             {
@@ -258,6 +384,16 @@
           ],
           "description": "Scaling plan properties."
         },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "tags": {
           "oneOf": [
             {
@@ -282,7 +418,6 @@
       },
       "required": [
         "apiVersion",
-        "location",
         "name",
         "properties",
         "type"
@@ -298,16 +433,52 @@
             "2021-01-14-preview"
           ]
         },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[-\\w\\._,\\(\\)]+$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type.  If supported, the resource provider must validate and persist this value."
+        },
         "location": {
           "type": "string",
           "description": "The geo-location where the resource lives"
         },
+        "managedBy": {
+          "type": "string",
+          "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
+        },
         "name": {
           "type": "string",
           "minLength": 3,
           "maxLength": 64,
           "description": "The name of the workspace"
         },
+        "plan": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetPlan"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "properties": {
           "oneOf": [
             {
@@ -319,6 +490,16 @@
           ],
           "description": "Schema for Workspace properties."
         },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "tags": {
           "oneOf": [
             {
@@ -343,7 +524,6 @@
       },
       "required": [
         "apiVersion",
-        "location",
         "name",
         "properties",
         "type"
@@ -381,6 +561,17 @@
         "hostPoolArmPath": {
           "type": "string",
           "description": "HostPool arm path of ApplicationGroup."
+        },
+        "migrationRequest": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MigrationRequestProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties for arm migration."
         }
       },
       "required": [
@@ -541,7 +732,8 @@
               "type": "string",
               "enum": [
                 "Personal",
-                "Pooled"
+                "Pooled",
+                "BYODesktop"
               ]
             },
             {
@@ -577,6 +769,17 @@
           ],
           "description": "The max session limit of HostPool."
         },
+        "migrationRequest": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MigrationRequestProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties for arm migration."
+        },
         "personalDesktopAssignmentType": {
           "oneOf": [
             {
@@ -734,6 +937,34 @@
       ],
       "description": "Microsoft.DesktopVirtualization/hostPools/msixPackages"
     },
+    "MigrationRequestProperties": {
+      "type": "object",
+      "properties": {
+        "migrationPath": {
+          "type": "string",
+          "description": "The path to the legacy object to migrate."
+        },
+        "operation": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Start",
+                "Revoke",
+                "Complete",
+                "Hide",
+                "Unhide"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of operation for migration."
+        }
+      },
+      "description": "Properties for arm migration."
+    },
     "MsixPackageApplications": {
       "type": "object",
       "properties": {
@@ -918,6 +1149,103 @@
       },
       "description": "Represents a RegistrationInfo definition."
     },
+    "ResourceModelWithAllowedPropertySetIdentity": {
+      "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."
+        }
+      }
+    },
+    "ResourceModelWithAllowedPropertySetPlan": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "A user defined name of the 3rd Party Artifact that is being procured."
+        },
+        "product": {
+          "type": "string",
+          "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. "
+        },
+        "promotionCode": {
+          "type": "string",
+          "description": "A publisher provided promotion code as provisioned in Data Market for the said product/artifact."
+        },
+        "publisher": {
+          "type": "string",
+          "description": "The publisher of the 3rd Party Artifact that is being bought. E.g. NewRelic"
+        },
+        "version": {
+          "type": "string",
+          "description": "The version of the desired product/artifact."
+        }
+      },
+      "required": [
+        "name",
+        "product",
+        "publisher"
+      ]
+    },
+    "ResourceModelWithAllowedPropertySetSku": {
+      "type": "object",
+      "properties": {
+        "capacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted."
+        },
+        "family": {
+          "type": "string",
+          "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here."
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the SKU. Ex - P3. It is typically a letter+number code"
+        },
+        "size": {
+          "type": "string",
+          "description": "The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code. "
+        },
+        "tier": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Free",
+                "Basic",
+                "Standard",
+                "Premium"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "This field is required to be implemented by the Resource Provider if the service has more than one tier, but is not required on a PUT."
+        }
+      },
+      "required": [
+        "name"
+      ]
+    },
     "ScalingHostPoolReference": {
       "type": "object",
       "properties": {
@@ -974,14 +1302,26 @@
               "type": "string",
               "enum": [
                 "Personal",
-                "Pooled"
+                "Pooled",
+                "BYODesktop"
               ]
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "HostPool type for scaling plan."
+          "description": "HostPool type for desktop."
+        },
+        "ring": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The ring number of scaling plan."
         },
         "schedules": {
           "oneOf": [
diff --git a/schemas/2021-02-01-preview/Microsoft.DesktopVirtualization.json b/schemas/2021-02-01-preview/Microsoft.DesktopVirtualization.json
index 44cc82213c..0ca69d0c82 100644
--- a/schemas/2021-02-01-preview/Microsoft.DesktopVirtualization.json
+++ b/schemas/2021-02-01-preview/Microsoft.DesktopVirtualization.json
@@ -13,16 +13,52 @@
             "2021-02-01-preview"
           ]
         },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[-\\w\\._,\\(\\)]+$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type.  If supported, the resource provider must validate and persist this value."
+        },
         "location": {
           "type": "string",
           "description": "The geo-location where the resource lives"
         },
+        "managedBy": {
+          "type": "string",
+          "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
+        },
         "name": {
           "type": "string",
           "minLength": 3,
           "maxLength": 64,
           "description": "The name of the application group"
         },
+        "plan": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetPlan"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "properties": {
           "oneOf": [
             {
@@ -44,6 +80,16 @@
             ]
           }
         },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "tags": {
           "oneOf": [
             {
@@ -68,7 +114,6 @@
       },
       "required": [
         "apiVersion",
-        "location",
         "name",
         "properties",
         "type"
@@ -125,16 +170,52 @@
             "2021-02-01-preview"
           ]
         },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[-\\w\\._,\\(\\)]+$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type.  If supported, the resource provider must validate and persist this value."
+        },
         "location": {
           "type": "string",
           "description": "The geo-location where the resource lives"
         },
+        "managedBy": {
+          "type": "string",
+          "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
+        },
         "name": {
           "type": "string",
           "minLength": 3,
           "maxLength": 64,
           "description": "The name of the host pool within the specified resource group"
         },
+        "plan": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetPlan"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "properties": {
           "oneOf": [
             {
@@ -156,6 +237,16 @@
             ]
           }
         },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "tags": {
           "oneOf": [
             {
@@ -180,7 +271,6 @@
       },
       "required": [
         "apiVersion",
-        "location",
         "name",
         "properties",
         "type"
@@ -237,16 +327,52 @@
             "2021-02-01-preview"
           ]
         },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[-\\w\\._,\\(\\)]+$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type.  If supported, the resource provider must validate and persist this value."
+        },
         "location": {
           "type": "string",
           "description": "The geo-location where the resource lives"
         },
+        "managedBy": {
+          "type": "string",
+          "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
+        },
         "name": {
           "type": "string",
           "minLength": 3,
           "maxLength": 24,
           "description": "The name of the scaling plan."
         },
+        "plan": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetPlan"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "properties": {
           "oneOf": [
             {
@@ -258,6 +384,16 @@
           ],
           "description": "Scaling plan properties."
         },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "tags": {
           "oneOf": [
             {
@@ -282,7 +418,6 @@
       },
       "required": [
         "apiVersion",
-        "location",
         "name",
         "properties",
         "type"
@@ -298,16 +433,52 @@
             "2021-02-01-preview"
           ]
         },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetIdentity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[-\\w\\._,\\(\\)]+$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type.  If supported, the resource provider must validate and persist this value."
+        },
         "location": {
           "type": "string",
           "description": "The geo-location where the resource lives"
         },
+        "managedBy": {
+          "type": "string",
+          "description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
+        },
         "name": {
           "type": "string",
           "minLength": 3,
           "maxLength": 64,
           "description": "The name of the workspace"
         },
+        "plan": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetPlan"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "properties": {
           "oneOf": [
             {
@@ -319,6 +490,16 @@
           ],
           "description": "Schema for Workspace properties."
         },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceModelWithAllowedPropertySetSku"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "tags": {
           "oneOf": [
             {
@@ -343,7 +524,6 @@
       },
       "required": [
         "apiVersion",
-        "location",
         "name",
         "properties",
         "type"
@@ -381,6 +561,17 @@
         "hostPoolArmPath": {
           "type": "string",
           "description": "HostPool arm path of ApplicationGroup."
+        },
+        "migrationRequest": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MigrationRequestProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties for arm migration."
         }
       },
       "required": [
@@ -578,6 +769,17 @@
           ],
           "description": "The max session limit of HostPool."
         },
+        "migrationRequest": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MigrationRequestProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties for arm migration."
+        },
         "personalDesktopAssignmentType": {
           "oneOf": [
             {
@@ -735,6 +937,34 @@
       ],
       "description": "Microsoft.DesktopVirtualization/hostPools/msixPackages"
     },
+    "MigrationRequestProperties": {
+      "type": "object",
+      "properties": {
+        "migrationPath": {
+          "type": "string",
+          "description": "The path to the legacy object to migrate."
+        },
+        "operation": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Start",
+                "Revoke",
+                "Complete",
+                "Hide",
+                "Unhide"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of operation for migration."
+        }
+      },
+      "description": "Properties for arm migration."
+    },
     "MsixPackageApplications": {
       "type": "object",
       "properties": {
@@ -919,6 +1149,103 @@
       },
       "description": "Represents a RegistrationInfo definition."
     },
+    "ResourceModelWithAllowedPropertySetIdentity": {
+      "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."
+        }
+      }
+    },
+    "ResourceModelWithAllowedPropertySetPlan": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "A user defined name of the 3rd Party Artifact that is being procured."
+        },
+        "product": {
+          "type": "string",
+          "description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. "
+        },
+        "promotionCode": {
+          "type": "string",
+          "description": "A publisher provided promotion code as provisioned in Data Market for the said product/artifact."
+        },
+        "publisher": {
+          "type": "string",
+          "description": "The publisher of the 3rd Party Artifact that is being bought. E.g. NewRelic"
+        },
+        "version": {
+          "type": "string",
+          "description": "The version of the desired product/artifact."
+        }
+      },
+      "required": [
+        "name",
+        "product",
+        "publisher"
+      ]
+    },
+    "ResourceModelWithAllowedPropertySetSku": {
+      "type": "object",
+      "properties": {
+        "capacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted."
+        },
+        "family": {
+          "type": "string",
+          "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here."
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the SKU. Ex - P3. It is typically a letter+number code"
+        },
+        "size": {
+          "type": "string",
+          "description": "The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code. "
+        },
+        "tier": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Free",
+                "Basic",
+                "Standard",
+                "Premium"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "This field is required to be implemented by the Resource Provider if the service has more than one tier, but is not required on a PUT."
+        }
+      },
+      "required": [
+        "name"
+      ]
+    },
     "ScalingHostPoolReference": {
       "type": "object",
       "properties": {
diff --git a/schemas/2021-03-01/Microsoft.Datadog.json b/schemas/2021-03-01/Microsoft.Datadog.json
new file mode 100644
index 0000000000..37468af650
--- /dev/null
+++ b/schemas/2021-03-01/Microsoft.Datadog.json
@@ -0,0 +1,721 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2021-03-01/Microsoft.Datadog.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Datadog",
+  "description": "Microsoft Datadog Resource Types",
+  "resourceDefinitions": {
+    "monitors": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-03-01"
+          ]
+        },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/IdentityProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "location": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string",
+          "description": "Monitor resource name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MonitorProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties specific to the monitor resource."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/monitors_tagRules_childResource"
+              },
+              {
+                "$ref": "#/definitions/monitors_singleSignOnConfigurations_childResource"
+              }
+            ]
+          }
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceSku"
+            },
+            {
+              "$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"
+            }
+          ]
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Datadog/monitors"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Datadog/monitors"
+    },
+    "monitors_singleSignOnConfigurations": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-03-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Configuration name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DatadogSingleSignOnProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Datadog/monitors/singleSignOnConfigurations"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Datadog/monitors/singleSignOnConfigurations"
+    },
+    "monitors_tagRules": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-03-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Rule set name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MonitoringTagRulesProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Definition of the properties for a TagRules resource."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Datadog/monitors/tagRules"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Datadog/monitors/tagRules"
+    }
+  },
+  "subscription_resourceDefinitions": {
+    "agreements": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-03-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "enum": [
+            "default"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DatadogAgreementProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Terms properties."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Datadog/agreements"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Datadog/agreements"
+    }
+  },
+  "definitions": {
+    "DatadogAgreementProperties": {
+      "type": "object",
+      "properties": {
+        "accepted": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "If any version of the terms have been accepted, otherwise false."
+        },
+        "licenseTextLink": {
+          "type": "string",
+          "description": "Link to HTML with Microsoft and Publisher terms."
+        },
+        "plan": {
+          "type": "string",
+          "description": "Plan identifier string."
+        },
+        "privacyPolicyLink": {
+          "type": "string",
+          "description": "Link to the privacy policy of the publisher."
+        },
+        "product": {
+          "type": "string",
+          "description": "Product identifier string."
+        },
+        "publisher": {
+          "type": "string",
+          "description": "Publisher identifier string."
+        },
+        "retrieveDatetime": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Date and time in UTC of when the terms were accepted. This is empty if Accepted is false."
+        },
+        "signature": {
+          "type": "string",
+          "description": "Terms signature."
+        }
+      },
+      "description": "Terms properties."
+    },
+    "DatadogOrganizationProperties": {
+      "type": "object",
+      "properties": {
+        "apiKey": {
+          "type": "string",
+          "description": "Api key associated to the Datadog organization."
+        },
+        "applicationKey": {
+          "type": "string",
+          "description": "Application key associated to the Datadog organization."
+        },
+        "enterpriseAppId": {
+          "type": "string",
+          "description": "The Id of the Enterprise App used for Single sign on."
+        },
+        "linkingAuthCode": {
+          "type": "string",
+          "description": "The auth code used to linking to an existing datadog organization."
+        },
+        "linkingClientId": {
+          "type": "string",
+          "description": "The client_id from an existing in exchange for an auth token to link organization."
+        },
+        "redirectUri": {
+          "type": "string",
+          "description": "The redirect uri for linking."
+        }
+      },
+      "description": "Datadog organization properties"
+    },
+    "DatadogSingleSignOnProperties": {
+      "type": "object",
+      "properties": {
+        "enterpriseAppId": {
+          "type": "string",
+          "description": "The Id of the Enterprise App used for Single sign-on."
+        },
+        "provisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Accepted",
+                "Creating",
+                "Updating",
+                "Deleting",
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "Deleted",
+                "NotSpecified"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "singleSignOnState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Initial",
+                "Enable",
+                "Disable",
+                "Existing"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        }
+      }
+    },
+    "FilteringTag": {
+      "type": "object",
+      "properties": {
+        "action": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Include",
+                "Exclude"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The name (also known as the key) of the tag."
+        },
+        "value": {
+          "type": "string",
+          "description": "The value of the tag."
+        }
+      },
+      "description": "The definition of a filtering tag. Filtering tags are used for capturing resources and include/exclude them from being monitored."
+    },
+    "IdentityProperties": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "SystemAssigned",
+                "UserAssigned"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        }
+      }
+    },
+    "LogRules": {
+      "type": "object",
+      "properties": {
+        "filteringTags": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/FilteringTag"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "List of filtering tags to be used for capturing logs. This only takes effect if SendResourceLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags."
+        },
+        "sendAadLogs": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag specifying if AAD logs should be sent for the Monitor resource."
+        },
+        "sendResourceLogs": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag specifying if Azure resource logs should be sent for the Monitor resource."
+        },
+        "sendSubscriptionLogs": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag specifying if Azure subscription logs should be sent for the Monitor resource."
+        }
+      },
+      "description": "Set of rules for sending logs for the Monitor resource."
+    },
+    "MetricRules": {
+      "type": "object",
+      "properties": {
+        "filteringTags": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/FilteringTag"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "List of filtering tags to be used for capturing metrics. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags."
+        }
+      },
+      "description": "Set of rules for sending metrics for the Monitor resource."
+    },
+    "MonitoringTagRulesProperties": {
+      "type": "object",
+      "properties": {
+        "logRules": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LogRules"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Set of rules for sending logs for the Monitor resource."
+        },
+        "metricRules": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MetricRules"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Set of rules for sending metrics for the Monitor resource."
+        },
+        "provisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Accepted",
+                "Creating",
+                "Updating",
+                "Deleting",
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "Deleted",
+                "NotSpecified"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "description": "Definition of the properties for a TagRules resource."
+    },
+    "MonitorProperties": {
+      "type": "object",
+      "properties": {
+        "datadogOrganizationProperties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DatadogOrganizationProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Datadog organization properties"
+        },
+        "liftrResourceCategory": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Unknown",
+                "MonitorLogs"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "marketplaceSubscriptionStatus": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Provisioning",
+                "Active",
+                "Suspended",
+                "Unsubscribed"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "monitoringStatus": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "provisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Accepted",
+                "Creating",
+                "Updating",
+                "Deleting",
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "Deleted",
+                "NotSpecified"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "userInfo": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UserInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "User info"
+        }
+      },
+      "description": "Properties specific to the monitor resource."
+    },
+    "monitors_singleSignOnConfigurations_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-03-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Configuration name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DatadogSingleSignOnProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "singleSignOnConfigurations"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Datadog/monitors/singleSignOnConfigurations"
+    },
+    "monitors_tagRules_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2021-03-01"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Rule set name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MonitoringTagRulesProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Definition of the properties for a TagRules resource."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "tagRules"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Datadog/monitors/tagRules"
+    },
+    "ResourceSku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the SKU."
+        }
+      },
+      "required": [
+        "name"
+      ]
+    },
+    "UserInfo": {
+      "type": "object",
+      "properties": {
+        "emailAddress": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[A-Za-z0-9._%+-]+@(?:[A-Za-z0-9-]+\\.)+[A-Za-z]{2,}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Email of the user used by Datadog for contacting them if needed"
+        },
+        "name": {
+          "type": "string",
+          "maxLength": 50,
+          "description": "Name of the user"
+        },
+        "phoneNumber": {
+          "type": "string",
+          "maxLength": 40,
+          "description": "Phone number of the user used by Datadog for contacting them if needed"
+        }
+      },
+      "description": "User info"
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
index 9f0d4765a1..1cddc85208 100644
--- a/schemas/common/autogeneratedResources.json
+++ b/schemas/common/autogeneratedResources.json
@@ -1603,36 +1603,12 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2021-01-01-preview/Microsoft.AVS.json#/resourceDefinitions/privateClouds_workloadNetworks_vmGroups"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2019-07-24-preview/Microsoft.AzureData.json#/resourceDefinitions/dataControllers"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2019-07-24-preview/Microsoft.AzureData.json#/resourceDefinitions/postgresInstances"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2019-07-24-preview/Microsoft.AzureData.json#/resourceDefinitions/sqlManagedInstances"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2019-07-24-preview/Microsoft.AzureData.json#/resourceDefinitions/sqlServerInstances"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2019-07-24-preview/Microsoft.AzureData.json#/resourceDefinitions/sqlServerRegistrations"
         },
         {
           "$ref": "https://schema.management.azure.com/schemas/2019-07-24-preview/Microsoft.AzureData.json#/resourceDefinitions/sqlServerRegistrations_sqlServers"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-09-08-preview/Microsoft.AzureData.json#/resourceDefinitions/dataControllers"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-09-08-preview/Microsoft.AzureData.json#/resourceDefinitions/postgresInstances"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-09-08-preview/Microsoft.AzureData.json#/resourceDefinitions/sqlManagedInstances"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-09-08-preview/Microsoft.AzureData.json#/resourceDefinitions/sqlServerInstances"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2016-01-01/Microsoft.AzureStack.json#/resourceDefinitions/registrations"
         },
@@ -2131,6 +2107,9 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2017-04-18/Microsoft.CognitiveServices.json#/resourceDefinitions/accounts_privateEndpointConnections"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-08-20/Microsoft.Communication.json#/resourceDefinitions/communicationServices"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-08-20-preview/Microsoft.Communication.json#/resourceDefinitions/communicationServices"
         },
@@ -2719,6 +2698,15 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-02-01-preview/Microsoft.Datadog.json#/resourceDefinitions/monitors_tagRules"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2021-03-01/Microsoft.Datadog.json#/resourceDefinitions/monitors"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2021-03-01/Microsoft.Datadog.json#/resourceDefinitions/monitors_singleSignOnConfigurations"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2021-03-01/Microsoft.Datadog.json#/resourceDefinitions/monitors_tagRules"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2017-09-01-preview/Microsoft.DataFactory.json#/resourceDefinitions/factories"
         },
@@ -2761,6 +2749,9 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_pipelines"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_privateEndpointConnections"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_triggers"
         },
@@ -5602,6 +5593,27 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-11-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_snapshotPolicies"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-12-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-12-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_backupPolicies"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-12-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_capacityPools"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-12-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_capacityPools_volumes"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-12-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_capacityPools_volumes_backups"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-12-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_capacityPools_volumes_snapshots"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-12-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_snapshotPolicies"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-08-01/Microsoft.Network.FrontDoor.json#/resourceDefinitions/frontDoors"
         },
@@ -6067,6 +6079,15 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-10-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_extendedInformation"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_certificates"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2021-01-01/Microsoft.RecoveryServices.json#/resourceDefinitions/vaults_extendedInformation"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2016-08-10/Microsoft.RecoveryServices.SiteRecovery.json#/resourceDefinitions/vaults_replicationAlertSettings"
         },